Skip to content

Correctly free DTrace resources. #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tmetsch merged 1 commit into from
Feb 15, 2022
Merged

Correctly free DTrace resources. #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions dtrace_cython/consumer.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ cdef class DTraceConsumer:
self.walk_func = noop_walk if walk_func is None else walk_func

cdef int err
if not hasattr(self, 'handle'):
if self.handle == NULL:
# ensure we only grab 1 - cython might call init twice, of more.
self.handle = dtrace_open(3, 0, &err)
if self.handle == NULL:
Expand All @@ -331,8 +331,9 @@ cdef class DTraceConsumer:
"""
Release DTrace handle.
"""
if hasattr(self, 'handle') and self.handle != NULL:
if self.handle != NULL:
dtrace_close(self.handle)
self.handle = NULL

cpdef compile(self, str script):
"""
Expand Down Expand Up @@ -437,7 +438,7 @@ cdef class DTraceContinuousConsumer:
self.script = script.encode("utf-8")

cdef int err
if not hasattr(self, 'handle'):
if self.handle == NULL:
# ensure we only grab 1 - cython might call init twice, of more.
self.handle = dtrace_open(3, 0, &err)
if self.handle == NULL:
Expand All @@ -456,9 +457,10 @@ cdef class DTraceContinuousConsumer:
"""
Release DTrace handle.
"""
if hasattr(self, 'handle') and self.handle != NULL:
if self.handle != NULL:
dtrace_stop(self.handle)
dtrace_close(self.handle)
self.handle = NULL

cpdef go(self):
"""
Expand Down