Changeset 166 in xpra

Timestamp:

09/19/11 09:41:22 (20 months ago)

Author:

antoine

Message:

try harder to close cleanly: ensure we close the socket when reaching the end of the write loop so that the last messages do go out, move disconnect code to a server.py function so that a client can request his own disconnection

Location:

trunk/src/xpra

Files:

• protocol.py (modified) (5 diffs)
• server.py (modified) (4 diffs)

trunk/src/xpra/protocol.py

@@ -83 +83 @@
         self._source_has_more = False
         self._recv_counter = 0
-        self.closing = False
         self._closed = False
         self._read_decoder = IncrBDecode()
@@ -120 +119 @@
 
     def _write_thread_loop(self):
-        while not self._closed:
-            log("write thread: waiting for data to write")
-            buf = self._write_queue.get()
-            # Used to signal that we should exit:
-            if buf is None:
-                return
-            try:
-                while buf:
-                    log("write thread: writing %s", repr_ellipsized(buf))
-                    buf = buf[self._conn.write(buf):]
-            except (OSError, IOError, socket.error), e:
-                log.info("Error writing to connection: %s", e)
-                main_thread_call(self._connection_lost)
-                return
-            except TypeError:
-                assert self._closed
-                return
-            if self._write_queue.empty():
-                main_thread_call(self._maybe_queue_more_writes)
-        return False
+        try:
+            while True:
+                log("write thread: waiting for data to write")
+                buf = self._write_queue.get()
+                # Used to signal that we should exit:
+                if buf is None:
+                    log("write thread: empty marker, exiting")
+                    break
+                try:
+                    while buf:
+                        log("write thread: writing %s", repr_ellipsized(buf))
+                        buf = buf[self._conn.write(buf):]
+                except (OSError, IOError, socket.error), e:
+                    log.info("Error writing to connection: %s", e)
+                    main_thread_call(self._connection_lost)
+                    break
+                except TypeError:
+                    assert self._closed
+                    break
+                if self._write_queue.empty():
+                    main_thread_call(self._maybe_queue_more_writes)
+        finally:
+            log("write thread: ended, closing socket")
+            self._conn.close()
 
     def _read_thread_loop(self):
@@ -157 +160 @@
             self._read_queue.put(buf)
             main_thread_call(self._handle_read)
+            if not buf:
+                log("read thread: eof")
+                break
+        log("read thread: ended")
 
     def _connection_lost(self):
@@ -204 +211 @@
                     unprocessed = self._decompressor.decompress(unprocessed)
                 self._read_decoder = IncrBDecode(unprocessed)
-        return False
+        log("main thread: read handled")
 
     def _process_packet(self, decoded):
@@ -234 +241 @@
             self._write_queue.put(None)
             self._closed = True
-            self._conn.close()

trunk/src/xpra/server.py

@@ -793 +793 @@
         # set this as our new one:
         if self._protocol is not None:
-            log.info("Disconnecting existing client")
-            #ensure that from now on we ignore any incoming packets coming
-            #from this connection as these could potentially set some keys pressed, etc
-            self._protocol.closing = True
-            self._clear_keys_pressed()
-            # send message asking for disconnection politely:
-            self._protocol.source.send_packet_now(["disconnect", "new valid connection received"])
-            def force_disconnect(protocol):
-                protocol.close()
-            #give 5 seconds for the write buffer to flush then we force disconnect it:
-            gobject.timeout_add(5000, force_disconnect, self._protocol)
+            self.disconnect("new valid connection received")
         self._protocol = proto
         ServerSource(self._protocol)
@@ -839 +829 @@
                 self._send_new_window_packet(window)
 
+    def disconnect(self, reason):
+        log.info("Disconnecting existing client, reason is: %s" % reason)
+        # send message asking for disconnection politely:
+        self._protocol.source.send_packet_now(["disconnect", reason])
+        self._protocol.close()
+        #this ensures that from now on we ignore any incoming packets coming
+        #from this connection as these could potentially set some keys pressed, etc
+        #so it is now safe to clear them:
+        self._clear_keys_pressed()
+        log.info("Connection lost")
+
+    def _process_disconnect(self, proto, packet):
+        self.disconnect("on client request")
+
     def _process_server_settings(self, proto, packet):
         (_, settings) = packet
@@ -1016 +1020 @@
         "jpeg-quality": _process_jpeg_quality,
         "buffer-refresh": _process_buffer_refresh,
+        "disconnect": _process_disconnect,
         # "clipboard-*" packets are handled below:
         Protocol.CONNECTION_LOST: _process_connection_lost,
@@ -1023 +1028 @@
     def process_packet(self, proto, packet):
         packet_type = packet[0]
-        if self._protocol and self._protocol.closing:
-            log.debug("ignoring %s packet on socket which is closing" % packet_type)
-            return
         if (isinstance(packet_type, str)
             and packet_type.startswith("clipboard-")):