Changeset 62100 in vbox for trunk

Timestamp:

Jul 7, 2016 10:06:39 AM (9 years ago)

Author:

vboxsync

Message:

reporter.doPollWork: Added debug string to see who is calling.

Location:

trunk/src/VBox/ValidationKit/testdriver

Files:

• base.py (modified) (2 diffs)
• reporter.py (modified) (5 diffs)
• vbox.py (modified) (1 diff)
• vboxwrappers.py (modified) (4 diffs)

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

@@ -517 +517 @@
                 except:
                     pass;
-                reporter.doPollWork();
+                reporter.doPollWork('TdTaskBase.waitForTask');
                 fState = self.pollTask(True);
 
@@ -1118 +1118 @@
                         cMsSleep = 1000;
                     fMore = self.waitForTasksSleepWorker(cMsSleep);
-                    reporter.doPollWork(); # shouldn't be necessary, remove when we figure why...
+                    reporter.doPollWork('TestDriverBase.waitForTasks'); # shouldn't be necessary, remove when we figure why...
         except KeyboardInterrupt:
             self.fInterrupted = True;

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

@@ -290 +290 @@
     #
 
-    def doPollWork(self):
+    def doPollWork(self, sDebug = None):
         """
         Check if any pending stuff expired and needs doing.
         """
+        _ = sDebug;
         return None;
 
@@ -889 +890 @@
         return False;
 
-    def _xmlFlushIfNecessary(self, fPolling = False):
+    def _xmlFlushIfNecessary(self, fPolling = False, sDebug = None):
         """Flushes the XML back log if necessary."""
         tsNow = utils.timestampSecond();
@@ -896 +897 @@
         if fPolling is not True:
             self._secTsXmlLast = tsNow;
-        self._writeOutput('xml-debug/%s: %s s since flush, %s s since poll'
-                          % (len(self._asXml), cSecs, cSecsLast,)); # temporarily while debugging flush/poll problem.
+        self._writeOutput('xml-debug/%s: %s s since flush, %s s since poll %s'
+                          % (len(self._asXml), cSecs, cSecsLast, sDebug if sDebug is not None else '', )); # temporarily
 
         # Absolute flush thresholds.
@@ -941 +942 @@
         return None;
 
-    def doPollWork(self):
+    def doPollWork(self, sDebug = None):
         if len(self._asXml) > 0:
             g_oLock.acquire();
-            self._xmlFlushIfNecessary(fPolling = True);
+            self._xmlFlushIfNecessary(fPolling = True, sDebug = sDebug);
             g_oLock.release();
         return None;
@@ -1379 +1380 @@
     return cErrors;
 
-def doPollWork():
+def doPollWork(sDebug = None):
     """
     This can be called from wait loops and similar to make the reporter call
     home with pending XML and such.
     """
-    g_oReporter.doPollWork();
+    g_oReporter.doPollWork(sDebug);
     return None;
 

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

@@ -2289 +2289 @@
                 return -1
 
-            reporter.doPollWork();
+            reporter.doPollWork('vbox.TestDriver.waitOnProgress');
             try:    oProgress.waitForCompletion(cMsInterval);
             except: return -2;

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

@@ -223 +223 @@
             except KeyboardInterrupt: raise;
             except: pass;
-            reporter.doPollWork();
+            reporter.doPollWork('ProgressWrapper.waitForTask');
             fState = self.pollTask(False);
         return fState;
@@ -410 +410 @@
                 reporter.errorXcpt(self.sName);
                 return -2;
-            reporter.doPollWork();
+            reporter.doPollWork('ProgressWrapper.wait');
 
         try:
@@ -483 +483 @@
                     reporter.errorXcpt(self.sName);
                 return -2;
-            reporter.doPollWork();
+            reporter.doPollWork('ProgressWrapper.waitForOperation');
         # Not reached.
 
@@ -677 +677 @@
             except KeyboardInterrupt: raise;
             except: pass;
-            reporter.doPollWork();
+            reporter.doPollWork('SessionWrapper.waitForTask');
             fState = self.pollTask(False);
         return fState;