Changeset 66960 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

May 18, 2017 7:48:43 PM (8 years ago)

Author:

vboxsync

Message:

TxsConnectTask: Try avoid cylic references with the callback instance. Set the oParent member to None when deregistering it. Also, deregister the callback as soon as the task is done to speed up this process.

File:

• trunk/src/VBox/ValidationKit/testdriver/vboxwrappers.py (modified) (6 diffs)

trunk/src/VBox/ValidationKit/testdriver/vboxwrappers.py

@@ -2836 +2836 @@
             if    sMachineId == self.sMachineId \
               and sName  == '/VirtualBox/GuestInfo/Net/0/V4/IP':
-                self.oParentTask._setIp(sValue);                                # pylint: disable=W0212
+                oParentTask = self.oParentTask;
+                if oParentTask:
+                    oParentTask._setIp(sValue);                                # pylint: disable=W0212
 
 
@@ -2846 +2848 @@
         self.sMacAddr           = sMacAddr;
         self.fReversedSetup     = fReversedSetup;
-        self.oVBox              = oSession.oVBox;
+        self.oVBox              = oSession.oVBox;       ## @todo who needs this?
         self.oVBoxEventHandler  = None;
         self.oTxsSession        = None;
-        self.fpApiVer           = oSession.fpApiVer;
+        self.fpApiVer           = oSession.fpApiVer;    ## @todo who needs this?
 
         # Skip things we don't implement.
@@ -2904 +2906 @@
         """Deregisters the event handler."""
         fRc = True;
-        if self.oVBoxEventHandler is not None:
-            fRc = self.oVBoxEventHandler.unregister();
+        oVBoxEventHandler = self.oVBoxEventHandler;
+        if oVBoxEventHandler is not None:
             self.oVBoxEventHandler = None;
+            fRc = oVBoxEventHandler.unregister();
+            oVBoxEventHandler.oParentTask = None; # Try avoid cylic deps.
         return fRc;
 
@@ -2972 +2976 @@
 
         # Signal done, or retry?
+        fDeregister = False;
         if   fSuccess \
           or self.fReversedSetup \
           or self.getAgeAsMs() >= self.cMsTimeout:
             self.signalTaskLocked();
+            fDeregister = True;
         else:
             sIpAddr = self.sNextIpAddr if self.sNextIpAddr is not None else self.sIpAddr;
@@ -2981 +2987 @@
 
         self.oCv.release();
+
+        # If we're done, deregister the callback (w/o owning lock).  It will
+        if fDeregister:
+            self._deregisterEventHandler();
         return True;
 
@@ -3002 +3012 @@
     def cancelTask(self):
         """ Cancels the task. """
+        self._deregisterEventHandler(); # (make sure to avoid cyclic fun)
         self.oCv.acquire();
         if not self.fSignalled: