Changeset 83

Timestamp:

04/08/05 15:39:39 (7 years ago)

Author:

mj

Message:

Refactor IDE connection callback; make it a module-level function.

Files:

• WingDBG/trunk/WingDBG/WingDBG.py (modified) (2 diffs)

WingDBG/trunk/WingDBG/WingDBG.py

@@ -70 +70 @@
         
 class IDEConnectionTimeOut(Exception):
-    """Flag exception thrown on IDE conn timeout."""    
+    """Flag exception thrown on IDE conn timeout."""
+    
+
+def connectToIDECallback(status):
+    """Callback to open IDE connection on debug server thread"""
+    try:
+        if gHttpServer.debugger is not None:
+            # temporary try: except: wrapper to work around exception
+            # detection in the debugger
+            try:
+                # Without the following line, the debugger-to-IDE 
+                # auto-connect fails. It seems some C calls are needed 
+                # for things to resolve; race condition somewhere? 
+                # securechannel throws a socket.error (107) if not.
+                # Note that the old code (using _v_http_server) would
+                # fail too if it weren't for more C calls (through
+                # dict lookups) and persistence mechanisms.
+                repr(gHttpServer)
+                gHttpServer.debugger.ConnectToClient()
+            except:
+                # bare except, but with re-raise
+                raise
+    finally:
+        status['completed'] = 1
 
 
@@ -292 +315 @@
         # Schedule the connection
         if self.hasStarted():
-            status_dict = {'completed': 0}
-            func = lambda do_connect=self.__do_connect, dict=status_dict: \
-                   do_connect(dict)
-            gHttpServer.RunOnDebugThread(func)
+            status = {'completed': 0}
+            cb = lambda conn=connectToIDECallback, s=status: conn(s)
+            gHttpServer.RunOnDebugThread(cb)
             
             # Wait up to 3 seconds for connection
             start_time = time.time()
-            while time.time() < start_time + 5 and not status_dict['completed']:
+            while time.time() < start_time + 5 and not status['completed']:
                 time.sleep(0.05)
-            if not status_dict['completed']:
+            if not status['completed']:
                 raise IDEConnectionTimeOut
-        
-    security.declarePrivate('__do_connect')
-    def __do_connect(self, status_dict):
-        "Function to try connecting to client; gets run on the debug thread."
-        try:
-            if self.hasStarted():
-                if gHttpServer.debugger is not None:
-                    # temporary try: except: wrapper to work around exception
-                    # detection in the debugger
-                    try:
-                        # Without the following line, the debugger-to-IDE 
-                        # auto-connect fails. It seems some C calls are needed 
-                        # for things to resolve; race condition somewhere? 
-                        # securechannel throws a socket.error (107) if not.
-                        # Note that the old code (using _v_http_server) would
-                        # fail too if it weren't for more C calls (through
-                        # dict lookups) and persistence mechanisms.
-                        repr(gHttpServer)
-                        gHttpServer.debugger.ConnectToClient()
-                    except:
-                        # bare except, but with re-raise
-                        raise
-        finally:
-            status_dict['completed'] = 1
 
     security.declarePrivate('_import_netserver')