Changeset 1305

Timestamp:

06/06/09 14:12:14 (10 months ago)

Author:

mikeal

Message:

Adding thread2, killable threads library, and using them in the httpd server. Hopefully this will fix some of the zombie processes we see on Windows.

Location:

trunk

Files:

• setup.py (modified) (1 diff)
• windmill/server/https.py (modified) (2 diffs)
• windmill/server/thread2.py (added)

trunk/setup.py

@@ -42 +42 @@
 two_five_dependencies = [ 'simplejson >= 1.7.1',
                         ]
-two_four_dependencies = ['uuid']
+two_four_dependencies = ['uuid', 'ctypes']
 
 if not sys.version.startswith('2.6'):

trunk/windmill/server/https.py

@@ -375 +375 @@
         HTTPServer.__init__(self, address, handler)
         self.setup_environ()
+        self.threads = []
         
     daemon_threads = True
@@ -422 +423 @@
         except socket.error:
             pass
+            
+        for t in [t for t in self.threads if t.isAlive()]:
+            t.terminate()
+        
+    def process_request(self, request, client_address):
+        """Start a new thread to process the request."""
+        import thread2
+        t = thread2.Thread(target = self.process_request_thread,
+                           args = (request, client_address))
+        if self.daemon_threads:
+            t.setDaemon (1)
+        t.start()
+        self.threads.append(t)    
 
     def handle_error(self, request, client_address):