Changeset 20499 in vbox for trunk/src/VBox/Main/generic

Timestamp:

Jun 12, 2009 11:27:00 AM (15 years ago)

Author:

vboxsync

Message:

OpenGLTest.cpp: Fixed RTProcCreate argument list and executable name construction. Use monotonic time instead of wall time for timeout. (fixes compile but are otherwise untested)

File:

• trunk/src/VBox/Main/generic/OpenGLTest.cpp (modified) (4 diffs)

trunk/src/VBox/Main/generic/OpenGLTest.cpp

@@ -1 +1 @@
 /* $Id$ */
-
 /** @file
- * VBox host opengl support test
+ * VBox host opengl support test - generic implementation.
  */
 
@@ -13 +12 @@
 
 #include <VBox/err.h>
+#include <iprt/assert.h>
+#include <iprt/env.h>
+#include <iprt/param.h>
+#include <iprt/path.h>
 #include <iprt/process.h>
-#include <iprt/path.h>
-#include <iprt/param.h>
-#include <iprt/env.h>
-#include <iprt/thread.h>
-#include <string.h>
-#include <stdio.h>
+#include <iprt/string.h>
+#include <iprt/time.h>
 
 bool is3DAccelerationSupported()
 {
     static char pszVBoxPath[RTPATH_MAX];
-    const char *pArgs[2] = {"-test", NULL};
+    const char *papszArgs[3] = { NULL, "-test", NULL};
     int rc;
     RTPROCESS Process;
     RTPROCSTATUS ProcStatus;
-    RTTIMESPEC Start;
-    RTTIMESPEC Now;
+    uint64_t StartTS;
 
-    RTProcGetExecutableName(pszVBoxPath, RTPATH_MAX);
-    RTPathStripFilename(pszVBoxPath);
-    strcat(pszVBoxPath,"/VBoxTestOGL");
-#ifdef RT_OS_WINDOWS
-    strcat(pszVBoxPath,".exe");
+    rc = RTPathExecDir(pszVBoxPath, RTPATH_MAX); AssertRCReturn(rc, false);
+#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
+    rc = RTPathAppend(pszVBoxPath, RTPATH_MAX, "VBoxTestOGL");
+#else
+    rc = RTPathAppend(pszVBoxPath, RTPATH_MAX, "VBoxTestOGL.exe");
 #endif
+    AssertRCReturn(rc, false);
+    papszArgs[0] = pszVBoxPath;         /* argv[0] */
 
-    rc = RTProcCreate(pszVBoxPath, pArgs, RTENV_DEFAULT, 0, &Process);
-    if (RT_FAILURE(rc)) return false;
+    rc = RTProcCreate(pszVBoxPath, papszArgs, RTENV_DEFAULT, 0, &Process);
+    if (RT_FAILURE(rc))
+        return false;
 
-    RTTimeNow(&Start);
+    StartTS = RTTimeMilliTS();
 
     while (1)
@@ -49 +50 @@
             break;
 
-        if (RTTimeSpecGetMilli(RTTimeSpecSub(RTTimeNow(&Now), &Start)) > 30*1000 /* 30 sec */)
+        if (RTTimeMilliTS() - StartTS > 30*1000 /* 30 sec */)
         {
             RTProcTerminate(Process);
@@ -69 +70 @@
     return false;
 }
+