openstack
/
oslo.utils
Code Issues Proposed changes

Merge "eventletutils: Optimise EventletEvent.clear()"

This commit is contained in:
Zuul 2019-04-16 11:03:25 +00:00 committed by Gerrit Code Review
parent 895062f3af c5b065c3e4
commit 9a2ae8affd
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
oslo_utils/eventletutils.py
View File

@ -150,16 +150,12 @@ class EventletEvent(object):
"""
def __init__(self, *args, **kwargs):
super(EventletEvent, self).__init__()
self._set = False
self.clear()
def clear(self):
old_event = getattr(self, "_event", None)
was_set = self._set
self._set = False
self._event = _eventlet.event.Event()
if old_event is not None and not was_set:
old_event.send(True)
if getattr(self, '_set', True):
self._set = False
self._event = _eventlet.event.Event()
def is_set(self):
return self._set

24
oslo_utils/tests/test_eventletutils.py
View File

@ -201,6 +201,30 @@ class EventletUtilsTest(test_base.BaseTestCase):
with eventlet.timeout.Timeout(0.7):
b.wait()
def test_event_set_clear_timeout(self):
event = eventletutils.EventletEvent()
wakes = []
def thread_func():
result = event.wait(0.2)
wakes.append(result)
if len(wakes) == 1:
self.assertTrue(result)
event.clear()
else:
self.assertFalse(result)
a = greenthread.spawn(thread_func)
b = greenthread.spawn(thread_func)
eventlet.sleep(0) # start threads
event.set()
with eventlet.timeout.Timeout(0.3):
a.wait()
b.wait()
self.assertFalse(event.is_set())
self.assertEqual([True, False], wakes)
@mock.patch('oslo_utils.eventletutils._eventlet.event.Event')
def test_event_clear_already_sent(self, mock_event):
old_event = mock.Mock()