◐ Shell
clean mode source ↗

[3.6] bpo-31061: fix crash in asyncio speedup module by methane · Pull Request #2984 · python/cpython

python

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.

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

[3.6] bpo-31061: fix crash in asyncio speedup module #2984

Changes from all commits

Commits

File filter

Filter by extension
Conversations

Failed to load comments.

Loading

Jump to

Jump to file

Failed to load files.

Loading

Diff view
Diff view

12 changes: 12 additions & 0 deletions Lib/test/test_asyncio/test_futures.py

Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Tests for futures.py."""

import concurrent.futures
import gc
import re
import sys
import threading
Expand All @@ -19,9 +20,11 @@
def _fakefunc(f):
return f


def first_cb():
pass


def last_cb():
pass

Expand Down Expand Up @@ -483,6 +486,15 @@ def test_future_iter_throw(self):
Exception("elephant"), Exception("elephant"))
self.assertRaises(TypeError, fi.throw, list)

def test_future_del_collect(self):
class Evil:
def __del__(self):
gc.collect()

for i in range(100):
fut = self._new_future(loop=self.loop)
fut.set_result(Evil())


@unittest.skipUnless(hasattr(futures, '_CFuture'),
'requires the C _asyncio module')
Expand Down

15 changes: 15 additions & 0 deletions Lib/test/test_asyncio/test_tasks.py

Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import collections
import contextlib
import functools
import gc
import io
import os
import re
Expand Down Expand Up @@ -92,6 +93,20 @@ def setUp(self):
self.loop.set_task_factory(self.new_task)
self.loop.create_future = lambda: self.new_future(self.loop)

def test_task_del_collect(self):
class Evil:
def __del__(self):
gc.collect()

@asyncio.coroutine
def run():
return Evil()

self.loop.run_until_complete(
asyncio.gather(*[
self.new_task(self.loop, run()) for _ in range(100)
], loop=self.loop))

def test_other_loop_future(self):
other_loop = asyncio.new_event_loop()
fut = self.new_future(other_loop)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed a crash when using asyncio and threads.

4 changes: 4 additions & 0 deletions Modules/_asynciomodule.c

Original file line number Diff line number Diff line change
Expand Up @@ -971,6 +971,8 @@ FutureObj_dealloc(PyObject *self)
}
}

PyObject_GC_UnTrack(self);

if (fut->fut_weakreflist != NULL) {
PyObject_ClearWeakRefs(self);
}
Expand Down Expand Up @@ -1845,6 +1847,8 @@ TaskObj_dealloc(PyObject *self)
}
}

PyObject_GC_UnTrack(self);

if (task->task_weakreflist != NULL) {
PyObject_ClearWeakRefs(self);
}
Expand Down