A set of minor cleanups. 1) Remove the unused import of MAIN_DISPATCHER from ryu.controller.handler. 2) Remove the extraneous "close_requested" variable. 3) Ensure use of equality instead of identity for testing against DEAD_DISPATCHER. 4) Alter the exit condition for the _send_loop.
Signed-off-by: Victor J. Orlikowski <[email protected]> diff --git a/ryu/controller/controller.py b/ryu/controller/controller.py index 50c538e..08304d2 100644 --- a/ryu/controller/controller.py +++ b/ryu/controller/controller.py @@ -42,7 +42,7 @@ from ryu.ofproto import ofproto_v1_0 from ryu.ofproto import nx_match from ryu.controller import ofp_event -from ryu.controller.handler import HANDSHAKE_DISPATCHER, MAIN_DISPATCHER, DEAD_DISPATCHER +from ryu.controller.handler import HANDSHAKE_DISPATCHER, DEAD_DISPATCHER from ryu.lib.dpid import dpid_to_str @@ -121,8 +121,6 @@ def _deactivate(method): if not self.is_active: self.socket.close() - if self.state is not DEAD_DISPATCHER: - self.set_state(DEAD_DISPATCHER) return deactivate @@ -134,9 +132,7 @@ class Datapath(ofproto_protocol.ProtocolDesc): self.socket.setsockopt(IPPROTO_TCP, TCP_NODELAY, 1) self.socket.settimeout(CONF.socket_timeout) self.address = address - self.is_active = True - self.close_requested = False # The limit is arbitrary. We need to limit queue size to # prevent it from eating memory up. @@ -175,7 +171,8 @@ class Datapath(ofproto_protocol.ProtocolDesc): @_deactivate def close(self): - self.close_requested = True + if self.state != DEAD_DISPATCHER: + self.set_state(DEAD_DISPATCHER) def set_state(self, state): self.state = state @@ -190,7 +187,7 @@ class Datapath(ofproto_protocol.ProtocolDesc): required_len = ofproto_common.OFP_HEADER_SIZE count = 0 - while not self.close_requested: + while self.state != DEAD_DISPATCHER: ret = "" try: @@ -238,7 +235,7 @@ class Datapath(ofproto_protocol.ProtocolDesc): def _send_loop(self): try: - while True: + while self.state != DEAD_DISPATCHER: buf = self.send_q.get() self._send_q_sem.release() self.socket.sendall(buf) Best, Victor -- Victor J. Orlikowski <> vjo@[cs.]duke.edu
controller_cleanups.patch
Description: controller_cleanups.patch
------------------------------------------------------------------------------ Site24x7 APM Insight: Get Deep Visibility into Application Performance APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month Monitor end-to-end web transactions and take corrective actions now Troubleshoot faster and improve end-user experience. Signup Now! http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
_______________________________________________ Ryu-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ryu-devel
