mirrors/ryu
1
0
Fork 0
mirror of https://github.com/faucetsdn/ryu.git synced 2026-05-16 01:56:37 +02:00
Code Issues Projects Releases Wiki Activity

dispatcher: use TrackInstances and kill some WeakValueDictionary

Browse Source 
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
Isaku Yamahata 2012-02-24 14:37:31 +09:00 committed by FUJITA Tomonori
parent 6b2e6521a3
commit d650102e51
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ryu/app/event_dumper.py
View File

@ -32,7 +32,7 @@ class EventDumper(object):
def __init__(self, *_args, **_kwargs):
# EventDispatcher can be created and cloned before us.
# So register it explicitly
for ev_q in dispatcher.EventQueue.event_queues.values():
for ev_q in dispatcher.EventQueue.all_instances():
if ev_q == dispatcher.QUEUE_EV_Q:
continue
LOG.info('%s: registering q %s dispatcher %s',

20
ryu/controller/dispatcher.py
View File

@ -18,6 +18,7 @@ import weakref
from gevent.queue import Queue
from ryu.lib.track_instances import TrackInstances
from . import event
LOG = logging.getLogger('ryu.controller.dispatcher')
@ -30,13 +31,7 @@ LOG = logging.getLogger('ryu.controller.dispatcher')
# wvd.values() ws: iterator
class EventQueue(object):
# WeakValueDictionary: This set is populated by __init__().
# So need to use weak reference in order to make
# instances freeable by avoiding refrence count.
# Otherwise, instances can't be freed.
event_queues = weakref.WeakValueDictionary()
class EventQueue(TrackInstances):
# weakref: break circular reference
# self._ev_q_weakref == weakref.ref(self)
_ev_q_weakref = None
@ -62,7 +57,6 @@ class EventQueue(object):
self.ev_q = Queue()
self.aux = aux # for EventQueueCreate event
self.event_queues[id(self)] = self
self._queue_q_ev(EventQueueCreate(self, True))
def __del__(self):
@ -107,13 +101,7 @@ class EventQueue(object):
self.dispatcher(ev)
class EventDispatcher(object):
# WeakValueDictionary: This set is populated by __init__().
# So need to use weak reference in order to make
# instances freeable by avoiding refrence count.
# Otherwise, instances can't be freed.
event_dispatchers = weakref.WeakValueDictionary()
class EventDispatcher(TrackInstances):
def __init__(self, name):
# WeakValueDictionary: In order to let child to go away.
# We are interested only in alive children.
@ -122,8 +110,6 @@ class EventDispatcher(object):
self.events = {}
self.all_handlers = []
self.event_dispatchers[id(self)] = self
def clone(self):
cloned = EventDispatcher(self.name)
for ev_cls, h in self.events.items():