Skip to content

Fix contextvars.Context.copy memory leak. #191

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

Closed
hellysmile wants to merge 2 commits into from
Closed

Fix contextvars.Context.copy memory leak. #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad48ffe
Fix contextvars.Context.copy leak.
hellysmile Aug 7, 2018
042d360
Unify bint usage
hellysmile Aug 7, 2018
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
2 changes: 2 additions & 0 deletions uvloop/cbhandles.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
cdef class Handle:
cdef:
Loop loop
bint _context_copied
object context
bint _cancelled

Expand Down Expand Up @@ -28,6 +29,7 @@ cdef class TimerHandle:
bint _cancelled
UVTimer timer
Loop loop
bint _context_copied
object context
object __weakref__

Expand Down
8 changes: 8 additions & 0 deletions uvloop/cbhandles.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ cdef class Handle:
self._cancelled = 0
self.cb_type = 0
self._source_traceback = None
self._context_copied = 0

cdef inline _set_loop(self, Loop loop):
self.loop = loop
Expand All @@ -18,6 +19,7 @@ cdef class Handle:
if PY37:
if context is None:
context = <object>PyContext_CopyCurrent()
self._context_copied = 1
self.context = context
else:
if context is not None:
Expand All @@ -26,6 +28,8 @@ cdef class Handle:
self.context = None

def __dealloc__(self):
if self._context_copied:
Py_DECREF(self.context)
if UVLOOP_DEBUG and self.loop is not None:
self.loop._debug_cb_handles_count -= 1
if self.loop is None:
Expand Down Expand Up @@ -172,6 +176,7 @@ cdef class TimerHandle:
self.callback = callback
self.args = args
self._cancelled = 0
self._context_copied = 0

if UVLOOP_DEBUG:
self.loop._debug_cb_timer_handles_total += 1
Expand All @@ -180,6 +185,7 @@ cdef class TimerHandle:
if PY37:
if context is None:
context = <object>PyContext_CopyCurrent()
self._context_copied = 1
self.context = context
else:
if context is not None:
Expand All @@ -199,6 +205,8 @@ cdef class TimerHandle:
loop._timers.add(self)

def __dealloc__(self):
if self._context_copied:
Py_DECREF(self.context)
if UVLOOP_DEBUG:
self.loop._debug_cb_timer_handles_count -= 1
if self.timer is not None:
Expand Down