Changeset 138

Timestamp:

05/13/12 21:17:45 (12 years ago)

Author:

atzm

Message:

• change handler structure

File:

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

etherws/trunk/etherws.py

@@ -44 +44 @@
 import sys
 import base64
-import select
 import argparse
 import threading
@@ -56 +55 @@
 
 
-class TapListener(threading.Thread):
-    daemon = True
-
+class TapHandler(object):
     def __init__(self, dev, debug=False):
-        super(TapListener, self).__init__()
-
         self._debug = debug
+        self._clients = []
         self._tap = pytun.TunTapDevice(dev, pytun.IFF_TAP | pytun.IFF_NO_PI)
-        self._tap_lock = threading.Lock()
-
-        self._clients = []
-        self._clients_lock = threading.Lock()
-
-        try:
-            self._tap_lock.acquire()
-            self._tap.up()
-        finally:
-            self._tap_lock.release()
+        self._tap.up()
+        self._write_lock = threading.Lock()
+
+    def fileno(self):
+        return self._tap.fileno()
 
     def register_client(self, client):
-        try:
-            self._clients_lock.acquire()
-            self._clients.append(client)
-        finally:
-            self._clients_lock.release()
+        self._clients.append(client)
 
     def unregister_client(self, client):
-        try:
-            self._clients_lock.acquire()
-            self._clients.remove(client)
-        except ValueError:
-            pass
-        finally:
-            self._clients_lock.release()
+        self._clients.remove(client)
 
     def write(self, caller, message):
@@ -97 +78 @@
 
         try:
-            self._clients_lock.acquire()
+            self._write_lock.acquire()
 
             clients = self._clients[:]
@@ -103 +84 @@
             if caller is not self:
                 clients.remove(caller)
-                try:
-                    self._tap_lock.acquire()
-                    self._tap.write(message)
-                finally:
-                    self._tap_lock.release()
+                self._tap.write(message)
 
             message = base64.b64encode(message)
@@ -115 +92 @@
 
         finally:
-            self._clients_lock.release()
-
-    def run(self):
-        epoll = select.epoll()
-
-        try:
-            self._tap_lock.acquire()
-            epoll.register(self._tap.fileno(), select.EPOLLIN)
-        finally:
-            self._tap_lock.release()
-
-        while True:
-            evts = epoll.poll(1)
-            for fileno, evt in evts:
-                try:
-                    self._tap_lock.acquire()
-                    data = self._tap.read(self._tap.mtu)
-                finally:
-                    self._tap_lock.release()
-                self.write(self, data)
+            self._write_lock.release()
+
+    def __call__(self, fd, events):
+        self.write(self, self._tap.read(self._tap.mtu))
 
 
@@ -144 +105 @@
 
     def open(self):
-        if self._debug:
-            sys.stderr.write('[%s] opened\n' % self.request.remote_ip)
         self._tap.register_client(self)
 
     def on_message(self, message):
-        if self._debug:
-            sys.stderr.write('[%s] received\n' % self.request.remote_ip)
         self._tap.write(self, base64.b64decode(message))
 
     def on_close(self):
-        if self._debug:
-            sys.stderr.write('[%s] closed\n' % self.request.remote_ip)
         self._tap.unregister_client(self)
 
@@ -185 +140 @@
 
 def server_main(args):
-    tap = TapListener(args.device, debug=args.debug)
-    tap.start()
-
+    tap = TapHandler(args.device, debug=args.debug)
     app = tornado.web.Application([
         (args.path, EtherWebSocket, {'tap': tap, 'debug': args.debug}),
@@ -194 +147 @@
     server.listen(args.port, address=args.address)
 
-    tornado.ioloop.IOLoop.instance().start()
+    ioloop = tornado.ioloop.IOLoop.instance()
+    ioloop.add_handler(tap.fileno(), tap, ioloop.READ)
+    ioloop.start()
 
 
@@ -201 +156 @@
         websocket.enableTrace(True)
 
-    tap = TapListener(args.device, debug=args.debug)
+    tap = TapHandler(args.device, debug=args.debug)
     client = websocket.WebSocketApp(args.uri)
     client.write_message = client.send
     client.on_message = lambda s, m: tap.write(client, base64.b64decode(m))
-
-    if args.debug:
-        client.on_error = lambda s, e: sys.stderr.write(str(e) + '\n')
-        client.on_close = lambda s: sys.stderr.write('closed\n')
-
     tap.register_client(client)
-    tap.start()
-
-    client.run_forever()
+
+    t = threading.Thread(target=client.run_forever)
+    t.setDaemon(True)
+    t.start()
+
+    ioloop = tornado.ioloop.IOLoop.instance()
+    ioloop.add_handler(tap.fileno(), tap, ioloop.READ)
+    ioloop.start()