openstack/deb-python-eventlet
Code Issues Proposed changes

Added assertion in greenpool to prevent infinite waits. Thanks to rtyler for the horrifying idea.

Browse Source
This commit is contained in:
Ryan Williams
2010-03-17 17:03:16 -07:00
parent 18625a0fd6
commit 0179da8cf2
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
eventlet/greenpool.py
View File

@@ -110,6 +110,9 @@ class GreenPool(object):
def waitall(self): def waitall(self):
"""Waits until all greenthreads in the pool are finished working.""" """Waits until all greenthreads in the pool are finished working."""
assert greenthread.getcurrent() not in self.coroutines_running, \
"Calling waitall() from within one of the "\
"GreenPool's greenthreads will never terminate."
if self.running(): if self.running():
self.no_coros_running.wait() self.no_coros_running.wait()

5
tests/greenpool_test.py
View File

@@ -301,6 +301,11 @@ class GreenPool(tests.LimitedTestCase):
def test_waitall_on_nothing(self): def test_waitall_on_nothing(self):
p = greenpool.GreenPool() p = greenpool.GreenPool()
p.waitall() p.waitall()
def test_recursive_waitall(self):
p = greenpool.GreenPool()
gt = p.spawn(p.waitall)
self.assertRaises(AssertionError, gt.wait)
class GreenPile(tests.LimitedTestCase): class GreenPile(tests.LimitedTestCase):