diff options
| author | Victor J. Orlikowski <vjo@duke.edu> | 2016-02-26 11:20:27 -0500 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2016-02-27 22:01:49 +0900 |
| commit | 876e35d430c42a5c1fe40ac4ab74adc4d1b6b0d7 (patch) | |
| tree | 99abd9751b0c5a686718959725ed4083b8c2792c | |
| parent | 442aa61b6e3037de03862285f7124796ddb0e8fb (diff) | |
Protect events queue with a semaphore
Due to a discovered bug in eventlet queue put(). This is a temporary
workaround until eventlet is fixed.
Signed-off-by: Victor J. Orlikowski <vjo@duke.edu>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
| -rw-r--r-- | ryu/base/app_manager.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ryu/base/app_manager.py b/ryu/base/app_manager.py index 3d5d8959..cc510087 100644 --- a/ryu/base/app_manager.py +++ b/ryu/base/app_manager.py @@ -158,6 +158,7 @@ class RyuApp(object): self.threads = [] self.main_thread = None self.events = hub.Queue(128) + self._events_sem = hub.BoundedSemaphore(self.events.maxsize) if hasattr(self.__class__, 'LOGGER_NAME'): self.logger = logging.getLogger(self.__class__.LOGGER_NAME) else: @@ -280,6 +281,7 @@ class RyuApp(object): def _event_loop(self): while self.is_active or not self.events.empty(): ev, state = self.events.get() + self._events_sem.release() if ev == self._event_stop: continue handlers = self.get_handlers(ev, state) @@ -287,6 +289,7 @@ class RyuApp(object): handler(ev) def _send_event(self, ev, state): + self._events_sem.acquire() self.events.put((ev, state)) def send_event(self, name, ev, state=None): |