Changeset 162 for etherws/trunk

Timestamp:

06/16/12 20:00:37 (12 years ago)

Author:

atzm

Message:

• improve performance

Location:

etherws/trunk

Files:

• README.rst (modified) (2 diffs)
• etherws.py (modified) (2 diffs)
• setup.py (modified) (1 diff)

etherws/trunk/README.rst

@@ -46 +46 @@
   # ifconfig br0 up
 
-If connection through the tunnel is unstable, then you may fix it
-by changing VM's MTU to under 1500, e.g.::
+Additionally, you may improve performance by increasing MTU.
+For example,
 
-  # ifconfig eth0 mtu 1400
+on each hypervisor::
+
+ # ifconfig vnet0 mtu 16436
+ # ifconfig ethws0 mtu 16436
+
+on each VM::
+
+ # ifconfig eth0 mtu 16436
 
 Using SSL/TLS
@@ -124 +131 @@
 History
 =======
+0.6 (2012-06-16 JST)
+  - improve performance
+
 0.5 (2012-05-20 JST)
   - added passwd option to client mode

etherws/trunk/etherws.py

@@ -67 +67 @@
 
 class TapHandler(DebugMixIn):
+    READ_SIZE = 65535
+
     def __init__(self, dev, debug=False):
         self._debug = debug
@@ -72 +74 @@
         self._tap = pytun.TunTapDevice(dev, pytun.IFF_TAP | pytun.IFF_NO_PI)
         self._tap.up()
-        self._glock = threading.Lock()
+        self._taplock = threading.Lock()
 
     def fileno(self):
-        with self._glock:
+        with self._taplock:
             return self._tap.fileno()
 
     def register_client(self, client):
-        with self._glock:
-            self._clients.append(client)
+        self._clients.append(client)
 
     def unregister_client(self, client):
-        with self._glock:
-            self._clients.remove(client)
+        self._clients.remove(client)
 
     def write(self, caller, message):
-        with self._glock:
-            clients = self._clients[:]
-
-            if caller is not self:
-                clients.remove(caller)
+        clients = self._clients[:]
+
+        if caller is not self:
+            clients.remove(caller)
+
+            with self._taplock:
                 self._tap.write(message)
 
-            for c in clients:
-                c.write_message(message, True)
+        for c in clients:
+            c.write_message(message, True)
 
     def __call__(self, fd, events):
-        with self._glock:
-            data = self._tap.read(self._tap.mtu)
-        self.write(self, data)
+        buf = []
+
+        while True:
+            with self._taplock:
+                data = self._tap.read(self.READ_SIZE)
+
+            if data:
+                buf.append(data)
+
+            if len(data) < self.READ_SIZE:
+                break
+
+        self.write(self, ''.join(buf))
 
 

etherws/trunk/setup.py

@@ -37 +37 @@
 setup(
     name='etherws',
-    version='0.5',
+    version='0.6',
     description='Ethernet over WebSocket tunneling server/client',
     long_description=longdesc,