Changeset 11326 in vbox for trunk/src/VBox/Runtime

Timestamp:

Aug 11, 2008 11:01:01 AM (16 years ago)

Author:

vboxsync

Message:

iprt/tstTSC: Use mp.h

File:

• trunk/src/VBox/Runtime/testcase/tstTSC.cpp (modified) (13 diffs)

trunk/src/VBox/Runtime/testcase/tstTSC.cpp

@@ -34 +34 @@
 #include <iprt/runtime.h>
 
+
 /*******************************************************************************
 *   Structures and Typedefs                                                    *
@@ -40 +41 @@
 {
     /** The TSC.  */
-    uint64_t volatile   TSC;           
+    uint64_t volatile   TSC;
     /** The APIC ID. */
     uint8_t volatile    u8ApicId;
@@ -51 +52 @@
 } TSCDATA, *PTSCDATA;
 
+
 /*******************************************************************************
 *   Global Variables                                                           *
@@ -59 +61 @@
 static volatile uint32_t g_cReady;
 /** The variable the CPUs are spinning on.
- * 0: Spin. 
- * 1: Go ahead. 
- * 2: You're too late, back to square one. */ 
+ * 0: Spin.
+ * 1: Go ahead.
+ * 2: You're too late, back to square one. */
 static volatile uint32_t g_u32Go;
 /** The number of CPUs that managed to read the TSC. */
@@ -79 +81 @@
 
 /**
- * Thread function for catching the other cpus. 
- *  
+ * Thread function for catching the other cpus.
+ *
  * @returns VINF_SUCCESS (we don't care).
  * @param   Thread  The thread handle.
@@ -110 +112 @@
             const uint64_t  TSC1    = ASMReadTSC();
             const uint32_t  u32Go   = g_u32Go;
-            if (u32Go == 0) 
+            if (u32Go == 0)
                 continue;
 
@@ -122 +124 @@
                 const uint8_t   ApicId4 = ASMGetApicId();
 
-                if (    ApicId1 == ApicId2 
+                if (    ApicId1 == ApicId2
                     &&  ApicId1 == ApicId3
                     &&  ApicId1 == ApicId4
@@ -146 +148 @@
         }
     }
-    
+
     return VINF_SUCCESS;
 }
@@ -158 +160 @@
      * This is only relevant to on SMP systems.
      */
-    const unsigned cCpus = RTSystemProcessorGetCount();
-    if (cCpus <= 1) 
+    const unsigned cCpus = RTMpGetOnlineCount();
+    if (cCpus <= 1)
     {
         RTPrintf("tstTSC: SKIPPED - Only relevant on SMP systems\n");
@@ -170 +172 @@
     static TSCDATA s_aData[254];
     uint32_t i;
-    if (cCpus > RT_ELEMENTS(s_aData)) 
+    if (cCpus > RT_ELEMENTS(s_aData))
     {
         RTPrintf("tstTSC: FAILED - too many CPUs (%u)\n", cCpus);
@@ -254 +256 @@
         }
 
-        /* 
+        /*
          * Flip the "go" switch and do our readings.
          * We give the other threads the slack it takes to two extra TSC and APIC ID reads.
@@ -273 +275 @@
 
         /* Compose our own result. */
-        if (    ApicId1 == ApicId2 
+        if (    ApicId1 == ApicId2
             &&  ApicId1 == ApicId3
             &&  ApicId1 == ApicId4
@@ -339 +341 @@
             RTPrintf("%2d  %02x  %RX64\n", 0, s_aData[0].u8ApicId, s_aData[0].TSC);
             for (i = 1; i < cCpus; i++)
-                RTPrintf("%2d  %02x  %RX64  %s%lld\n", i, s_aData[i].u8ApicId, s_aData[i].TSC, 
+                RTPrintf("%2d  %02x  %RX64  %s%lld\n", i, s_aData[i].u8ApicId, s_aData[i].TSC,
                          s_aData[i].TSC > s_aData[0].TSC ? "+" : "", s_aData[i].TSC - s_aData[0].TSC);
             RTPrintf("(Needed %u attempt%s.)\n", cTries + 1, cTries ? "s" : "");