Changeset 39485 in vbox for trunk/src/VBox

Timestamp:

Dec 1, 2011 9:51:39 AM (13 years ago)

Author:

vboxsync

Message:

crOpenGL: stubInit syncronization needed for win XPDM guests, some debug tooling

File:

• trunk/src/VBox/Additions/common/crOpenGL/load.c (modified) (10 diffs)

trunk/src/VBox/Additions/common/crOpenGL/load.c

@@ -56 +56 @@
 
 static int stub_initialized = 0;
+#ifdef WINDOWS
+static CRmutex stub_init_mutex;
+#define STUB_INIT_LOCK() do { crLockMutex(&stub_init_mutex); } while (0)
+#define STUB_INIT_UNLOCK() do { crUnlockMutex(&stub_init_mutex); } while (0)
+#else
+#define STUB_INIT_LOCK() do { } while (0)
+#define STUB_INIT_UNLOCK() do { } while (0)
+#endif
 
 /* NOTE: 'SPUDispatchTable glim' is declared in NULLfuncs.py now */
@@ -311 +319 @@
  * We call all the SPU's cleanup functions.
  */
-static void stubSPUTearDown(void)
-{
-    crDebug("stubSPUTearDown");
-    if (!stub_initialized) return;
-
-    stub_initialized = 0;
+static void stubSPUTearDownLocked(void)
+{
+    crDebug("stubSPUTearDownLocked");
 
 #ifdef WINDOWS
@@ -359 +364 @@
 
     crMemset(&stub, 0, sizeof(stub));
+
+}
+
+/**
+ * This is called when we exit.
+ * We call all the SPU's cleanup functions.
+ */
+static void stubSPUTearDown(void)
+{
+    STUB_INIT_LOCK();
+    if (stub_initialized)
+    {
+        stubSPUTearDownLocked();
+        stub_initialized = 0;
+    }
+    STUB_INIT_UNLOCK();
 }
 
@@ -1101 +1122 @@
  * Returns TRUE on success, FALSE otherwise.
  */
-bool
-stubInit(void)
+static bool
+stubInitLocked(void)
 {
     /* Here is where we contact the mothership to find out what we're supposed
@@ -1121 +1142 @@
     int disable_sync = 0;
 
-    if (stub_initialized)
-        return true;
-
     stubInitVars();
 
@@ -1256 +1274 @@
 #endif
 
-    stub_initialized = 1;
     return true;
+}
+
+/**
+ * Do one-time initializations for the faker.
+ * Returns TRUE on success, FALSE otherwise.
+ */
+bool
+stubInit(void)
+{
+    bool bRc = true;
+    /* we need to serialize the initialization, otherwise racing is possible
+     * for XPDM-based d3d when a d3d switcher is testing the gl lib in two or more threads
+     * NOTE: the STUB_INIT_LOCK/UNLOCK is a NOP for non-win currently */
+    STUB_INIT_LOCK();
+    if (!stub_initialized)
+        bRc = stub_initialized = stubInitLocked();
+    STUB_INIT_UNLOCK();
+    return bRc;
 }
 
@@ -1272 +1307 @@
 #include <windows.h>
 
+#ifdef DEBUG_misha
+ /* debugging: this is to be able to catch first-chance notifications
+  * for exceptions other than EXCEPTION_BREAKPOINT in kernel debugger */
+# define VDBG_VEHANDLER
+#endif
+
+#ifdef VDBG_VEHANDLER
+static PVOID g_VBoxWDbgVEHandler = NULL;
+LONG WINAPI vboxVDbgVectoredHandler(struct _EXCEPTION_POINTERS *pExceptionInfo)
+{
+    PEXCEPTION_RECORD pExceptionRecord = pExceptionInfo->ExceptionRecord;
+    PCONTEXT pContextRecord = pExceptionInfo->ContextRecord;
+    switch (pExceptionRecord->ExceptionCode)
+    {
+        case EXCEPTION_BREAKPOINT:
+        case EXCEPTION_ACCESS_VIOLATION:
+        case EXCEPTION_STACK_OVERFLOW:
+        case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:
+        case EXCEPTION_FLT_DIVIDE_BY_ZERO:
+        case EXCEPTION_FLT_INVALID_OPERATION:
+        case EXCEPTION_INT_DIVIDE_BY_ZERO:
+        case EXCEPTION_ILLEGAL_INSTRUCTION:
+            CRASSERT(0);
+            break;
+        default:
+            break;
+    }
+    return EXCEPTION_CONTINUE_SEARCH;
+}
+
+void vboxVDbgVEHandlerRegister()
+{
+    CRASSERT(!g_VBoxWDbgVEHandler);
+    g_VBoxWDbgVEHandler = AddVectoredExceptionHandler(1,vboxVDbgVectoredHandler);
+    CRASSERT(g_VBoxWDbgVEHandler);
+}
+
+void vboxVDbgVEHandlerUnregister()
+{
+    ULONG uResult;
+    if (g_VBoxWDbgVEHandler)
+    {
+        uResult = RemoveVectoredExceptionHandler(g_VBoxWDbgVEHandler);
+        CRASSERT(uResult);
+        g_VBoxWDbgVEHandler = NULL;
+    }
+}
+#endif
+
 /* Windows crap */
 BOOL WINAPI DllMain(HINSTANCE hDLLInst, DWORD fdwReason, LPVOID lpvReserved)
@@ -1282 +1366 @@
     {
         CRNetServer ns;
+
+        crInitMutex(&stub_init_mutex);
+
+#ifdef VDBG_VEHANDLER
+        vboxVDbgVEHandlerRegister();
+#endif
 
         crNetInit(NULL, NULL);
@@ -1290 +1380 @@
         {
             crDebug("Failed to connect to host (is guest 3d acceleration enabled?), aborting ICD load.");
+#ifdef VDBG_VEHANDLER
+            vboxVDbgVEHandlerUnregister();
+#endif
             return FALSE;
         }
@@ -1301 +1394 @@
     {
         stubSPUSafeTearDown();
+
+#ifdef VDBG_VEHANDLER
+        vboxVDbgVEHandlerUnregister();
+#endif
+
         break;
     }