Changeset 165

Timestamp:

06/26/12 03:13:44 (12 years ago)

Author:

atzm

Message:

• kill multi-thread

File:

• etherws/trunk/etherws.py (modified) (7 diffs)

etherws/trunk/etherws.py

@@ -49 +49 @@
 import getpass
 import argparse
-import threading
+import traceback
 
 import pytun
@@ -150 +150 @@
         self._clients = []
         self._table = SwitchingTable(debug=debug)
-        self._tablelock = threading.Lock()
         self._tap = pytun.TunTapDevice(dev, pytun.IFF_TAP | pytun.IFF_NO_PI)
         self._tap.up()
-        self._taplock = threading.Lock()
         self.register_client(self)
 
@@ -166 +164 @@
         self._clients.remove(client)
 
-    # synchronized methods
     def write_message(self, message, binary=False):
-        with self._taplock:
-            self._tap.write(message)
+        self._tap.write(message)
 
     def write(self, caller, message):
         frame = EthernetFrame(message)
 
-        with self._tablelock:
-            self._table.learn(frame, caller)
+        self._table.learn(frame, caller)
 
         if not frame.multicast:
-            with self._tablelock:
-                dst = self._table.lookup(frame)
+            dst = self._table.lookup(frame)
 
             if dst:
@@ -204 +198 @@
 
         while True:
-            with self._taplock:
-                data = self._tap.read(self.READ_SIZE)
+            data = self._tap.read(self.READ_SIZE)
 
             if data:
@@ -264 +257 @@
         self._sock = None
         self.dprintf('disconnected: %s\n', lambda: self._url)
+
+    def fileno(self):
+        if self.closed:
+            raise websocket.WebSocketException('closed socket')
+        return self._sock.io_sock.fileno()
 
     def write_message(self, message, binary=False):
@@ -274 +272 @@
         self._sock.send(message, flag)
 
-    def run_forever(self):
+    def __call__(self, fd, events):
         try:
-            if self.closed:
-                self.open()
-            while True:
-                data = self._sock.recv()
-                if data is None:
-                    break
+            data = self._sock.recv()
+            if data is not None:
                 self._tap.write(self, data)
-        finally:
-            self.close()
+                return
+        except:
+            traceback.print_exc()
+        tornado.ioloop.IOLoop.instance().stop()
 
 
@@ -432 +428 @@
     ioloop = tornado.ioloop.IOLoop.instance()
     ioloop.add_handler(tap.fileno(), tap, ioloop.READ)
-
-    t = threading.Thread(target=ioloop.start)
-    t.setDaemon(True)
+    ioloop.add_handler(client.fileno(), client, ioloop.READ)
 
     if not args.foreground:
         daemonize()
 
-    t.start()
-    client.run_forever()
+    ioloop.start()