Changeset 65803 in vbox for trunk/src/VBox/ValidationKit/testmanager/batch

Timestamp:

Feb 17, 2017 1:17:17 PM (8 years ago)

Author:

vboxsync

Message:

vsheriff: check out kvm_lock_spinning guest stacks.

File:

• trunk/src/VBox/ValidationKit/testmanager/batch/virtual_test_sheriff.py (modified) (3 diffs)

trunk/src/VBox/ValidationKit/testmanager/batch/virtual_test_sheriff.py

@@ -745 +745 @@
         return False;
 
-    @staticmethod
-    def extractGuestCpuStack(sInfoText):
+    def extractGuestCpuStack(self, sInfoText):
         """
         Extracts the guest CPU stacks from the input file.
@@ -757 +756 @@
         off = 0;
         while True:
+            # Find the stack.
             offStart = sInfoText.find('=== start guest stack VCPU ', off);
             if offStart < 0:
                 break;
             offEnd  = sInfoText.find('=== end guest stack', offStart + 20);
-            if offEnd < 0:
+            if offEnd >= 0:
+                offEnd += 3;
+            else:
                 offEnd = sInfoText.find('=== start guest stack VCPU', offStart + 20);
-                if offEnd >= 0:
-                    offEnd += 3;
-                else:
+                if offEnd < 0:
                     offEnd = len(sInfoText);
 
             sStack = sInfoText[offStart : offEnd];
             sStack = sStack.replace('\r',''); # paranoia
-            asLines = sStack.split();
-
-            # figure the CPU.
+            asLines = sStack.split('\n');
+
+            # Figure the CPU.
             asWords = asLines[0].split();
-            if asWords < 6 or not asWords[6].isdigit():
+            if len(asWords) < 6 or not asWords[5].isdigit():
                 break;
-            iCpu = int(asWords[6]);
-
-            # add it.
+            iCpu = int(asWords[5]);
+
+            # Add it and advance.
             dRet[iCpu] = [sLine.rstrip() for sLine in asLines[2:-1]]
+            off = offEnd;
         return dRet;
 
@@ -800 +801 @@
                         cHits += 1;
                         break;
+            self.dprint('kvm_lock_spinning: %s/%s hits' % (cHits, len(dStacks),));
             if cHits == len(dStacks):
                 return (True, self.ktReason_VMM_kvm_lock_spinning);