Changeset 44992 in vbox for trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp

Timestamp:

Mar 11, 2013 3:41:01 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

84215

Message:

VBOX_WITH_DPC_LATENCY_CHECKER: Some adjustments. Please, don't use #pragma pack() unless you really need and mean it! Misaligning data just makes things slow...

File:

• trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp

@@ -37 +37 @@
 # include <VBox/HostServices/GuestPropertySvc.h>
 #endif
+#ifdef VBOX_WITH_DPC_LATENCY_CHECKER
+# include <VBox/VBoxGuest.h>
+# include "../VBoxGuestLib/VBGLR3Internal.h" /* HACK ALERT! Using vbglR3DoIOCtl directly!! */
+#endif
+
 
 /*******************************************************************************
@@ -101 +106 @@
     RTPrintf("\n");
 
-/* Exclude the Windows bits from the test version.  Anyone who needs to test
- * them can fix this. */
+    /* Exclude the Windows bits from the test version.  Anyone who needs to
+       test them can fix this. */
 #if defined(RT_OS_WINDOWS) && !defined(VBOX_CONTROL_TEST)
     if (eWhich  == GET_VIDEO_ACCEL || eWhich == USAGE_ALL)
@@ -1478 +1483 @@
 #endif
 
+#ifdef VBOX_WITH_DPC_LATENCY_CHECKER
+/**
+ * @callback_method_impl{FNVBOXCTRLCMDHANDLER, Command: help}
+ */
+static RTEXITCODE handleDpc(int argc, char *argv[])
+{
+# ifndef VBOX_CONTROL_TEST
+    int rc;
+    for (int i = 0; i < 30; i++)
+    {
+        rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_DPC_LATENCY_CHECKER, NULL, 0);
+        if (RT_FAILURE(rc))
+            break;
+        RTPrintf("%d\n", i);
+    }
+# else
+    int rc = VERR_NOT_IMPLEMENTED;
+# endif
+    if (RT_FAILURE(rc))
+        return VBoxControlError("Error. rc=%Rrc\n", rc);
+    RTPrintf("Samples collection completed.\n");
+    return RTEXITCODE_SUCCESS;
+}
+#endif /* VBOX_WITH_DPC_LATENCY_CHECKER */
+
+
 /**
  * @callback_method_impl{FNVBOXCTRLCMDHANDLER, Command: takesnapshot}
@@ -1535 +1566 @@
 }
 
-#ifdef VBOX_WITH_DPC_LATENCY_CHECKER
-#include "..\VBoxGuestLib\VBGLR3Internal.h"
-
-static RTEXITCODE handleDpc(int argc, char *argv[])
-{
-#ifndef VBOX_CONTROL_TEST
-    int rc = VINF_SUCCESS;
-    int i;
-    for (i = 0; i < 30; i++)
-    {
-        rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_DPC, NULL, 0);
-        if (RT_FAILURE(rc))
-        {
-            break;
-        }
-        RTPrintf("%d\n", i);
-    }
-#else
-    int rc = VERR_NOT_IMPLEMENTED;
-#endif
-    if (RT_SUCCESS(rc))
-    {
-        RTPrintf("Samples collection completed.\n");
-        return RTEXITCODE_SUCCESS;
-    }
-    else
-    {
-        VBoxControlError("Error. rc=%Rrc\n", rc);
-        return RTEXITCODE_FAILURE;
-    }
-}
-#endif /* VBOX_WITH_DPC_LATENCY_CHECKER */
 
 /** command handler type */
@@ -1595 +1594 @@
 #if !defined(VBOX_CONTROL_TEST)
     { "writecoredump",          handleWriteCoreDump },
+#endif
+#ifdef VBOX_WITH_DPC_LATENCY_CHECKER
+    { "dpc",                    handleDpc },
 #endif
     { "takesnapshot",           handleTakeSnapshot },
@@ -1604 +1606 @@
     { "getversion",             handleVersion },
     { "version",                handleVersion },
-#ifdef VBOX_WITH_DPC_LATENCY_CHECKER
-    { "dpc",                    handleDpc },
-#endif /* VBOX_WITH_DPC_LATENCY_CHECKER */
     { "help",                   handleHelp }
 };