Changeset 39568 in vbox for trunk/src/VBox/GuestHost/OpenGL

Timestamp:

Dec 9, 2011 1:52:31 PM (13 years ago)

Author:

vboxsync

Message:

crOpenGL: more threading fixes

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• include/cr_glstate.h (modified) (2 diffs)
• include/cr_threads.h (modified) (2 diffs)
• state_tracker/state.h (modified) (2 diffs)
• state_tracker/state_glsl.c (modified) (2 diffs)
• state_tracker/state_init.c (modified) (5 diffs)

trunk/src/VBox/GuestHost/OpenGL/include/cr_glstate.h

@@ -46 +46 @@
 #include "spu_dispatch_table.h"
 
+#ifdef CHROMIUM_THREADSAFE
+#include "cr_threads.h"
+#endif
+
 #include <iprt/cdefs.h>
 
@@ -129 +133 @@
      * => Thread2 still refers to destroyed ctx1
      * */
-    /* number of threads that have context set as current */
-    volatile int cRefs;
+    CRTSDREFDATA
 #endif
 

trunk/src/VBox/GuestHost/OpenGL/include/cr_threads.h

@@ -25 +25 @@
 #endif
 
-
+#include <iprt/asm.h>
 /*
  * Handle for Thread-Specific Data
@@ -101 +101 @@
 extern DECLEXPORT(void) crSignalSemaphore(CRsemaphore *s);
 
+typedef DECLCALLBACK(void) FNCRTSDREFDTOR(void*);
+typedef FNCRTSDREFDTOR *PFNCRTSDREFDTOR;
 
+typedef enum {
+    CRTSDREFDATA_STATE_UNDEFINED = 0,
+    CRTSDREFDATA_STATE_INITIALIZED,
+    CRTSDREFDATA_STATE_TOBE_DESTROYED,
+    CRTSDREFDATA_STATE_DESTROYING,
+    CRTSDREFDATA_STATE_32BIT_HACK = 0x7fffffff
+} CRTSDREFDATA_STATE;
+
+#define CRTSDREFDATA \
+    volatile uint32_t cTsdRefs; \
+    uint32_t enmTsdRefState; \
+    PFNCRTSDREFDTOR pfnTsdRefDtor; \
+
+#define crTSDRefInit(_p, _pfnDtor) do { \
+        (_p)->cTsdRefs = 1; \
+        (_p)->enmTsdRefState = CRTSDREFDATA_STATE_INITIALIZED; \
+        (_p)->pfnTsdRefDtor = (_pfnDtor); \
+    } while (0)
+
+#define crTSDRefIsFunctional(_p) (!!((_p)->enmTsdRefState == CRTSDREFDATA_STATE_INITIALIZED))
+
+#define crTSDRefAddRef(_p) do { \
+        int cRefs = ASMAtomicIncS32(&(_p)->cTsdRefs); \
+        CRASSERT(cRefs > 1 || (_p)->enmTsdRefState == CRTSDREFDATA_STATE_DESTROYING); \
+    } while (0)
+
+#define crTSDRefRelease(_p) do { \
+        int cRefs = ASMAtomicDecS32(&(_p)->cTsdRefs); \
+        CRASSERT(cRefs >= 0); \
+        if (!cRefs && (_p)->enmTsdRefState != CRTSDREFDATA_STATE_DESTROYING /* <- avoid recursion if crTSDRefAddRef/Release is called from dtor */) { \
+            (_p)->enmTsdRefState = CRTSDREFDATA_STATE_DESTROYING; \
+            (_p)->pfnTsdRefDtor((_p)); \
+        } \
+    } while (0)
+
+#define crTSDRefReleaseMarkDestroy(_p) do { \
+        (_p)->enmTsdRefState = CRTSDREFDATA_STATE_TOBE_DESTROYED; \
+    } while (0)
+
+#define crTSDRefGetCurrent(_t, _pTsd) ((_t*) crGetTSD((_pTsd)))
+
+#define crTSDRefSetCurrent(_t, _pTsd, _p) do { \
+        _t * oldCur = crTSDRefGetCurrent(_t, _pTsd); \
+        if (oldCur != (_p)) { \
+            crSetTSD((_pTsd), (_p)); \
+            if (oldCur) { \
+                crTSDRefRelease(oldCur); \
+            } \
+            if ((_p)) { \
+                crTSDRefAddRef((_t*)(_p)); \
+            } \
+        } \
+    } while (0)
 #ifdef __cplusplus
 }

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state.h

@@ -11 +11 @@
 #ifdef CHROMIUM_THREADSAFE
 #include "cr_threads.h"
-#include <iprt/asm.h>
 #endif
 
@@ -25 +24 @@
 #ifdef CHROMIUM_THREADSAFE
 extern CRtsd __contextTSD;
-#define GetCurrentContext() (CRContext *) crGetTSD(&__contextTSD)
+#define GetCurrentContext() crTSDRefGetCurrent(CRContext, &__contextTSD)
 
-/* NOTE: below ref & SetCurrentContext stuff is supposed to be used only internally!!
+/* NOTE: below SetCurrentContext stuff is supposed to be used only internally!!
  * it is placed here only to simplify things since some code besides state_init.c
  * (i.e. state_glsl.c) is using it */
-void crStateFreeContext(CRContext *ctx);
-#define CRCONTEXT_ADDREF(_ctx) do { \
-        int cRefs = ASMAtomicIncS32(&((CRContext*)(_ctx))->cRefs); \
-        CRASSERT(cRefs > 1); \
-    } while (0)
-#define CRCONTEXT_RELEASE(_ctx) do { \
-        int cRefs = ASMAtomicDecS32(&((CRContext*)(_ctx))->cRefs); \
-        CRASSERT(cRefs >= 0); \
-        if (!cRefs) { \
-            crStateFreeContext((_ctx)); \
-        } \
-    } while (0)
-#define SetCurrentContext(_ctx) do { \
-        CRContext * oldCur = GetCurrentContext(); \
-        if (oldCur != (_ctx)) { \
-            if (oldCur) { \
-                CRCONTEXT_RELEASE(oldCur); \
-            } \
-            if ((_ctx)) { \
-                CRCONTEXT_ADDREF(_ctx); \
-            } \
-            crSetTSD(&__contextTSD, _ctx); \
-        } \
-    } while (0)
+#define SetCurrentContext(_ctx) crTSDRefSetCurrent(CRContext, &__contextTSD, _ctx)
 #else
 extern CRContext *__currentContext;

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_glsl.c

@@ -174 +174 @@
       as the current context isn't the one being destroyed*/
 #ifdef CHROMIUM_THREADSAFE
-    CRASSERT(!ctx->cRefs);
-    ++ctx->cRefs; /* <- this is a hack to avoid subsequent SetCurrentContext(g) do recursive Destroy for ctx */
+    CRASSERT(g != ctx);
+    crTSDRefAddRef(ctx); /* <- this is a hack to avoid subsequent SetCurrentContext(g) do recursive Destroy for ctx */
     if (g)
-        CRCONTEXT_ADDREF(g); /* <- ensure the g is not destroyed by the following SetCurrentContext call */
+        crTSDRefAddRef(g); /* <- ensure the g is not destroyed by the following SetCurrentContext call */
     SetCurrentContext(ctx);
 #else
@@ -189 +189 @@
     SetCurrentContext(g);
     if (g)
-        CRCONTEXT_RELEASE(g);
-    --ctx->cRefs; /* <- restore back the cRefs (see above) */
+        crTSDRefRelease(g);
+    crTSDRefRelease(ctx); /* <- restore back the cRefs (see above) */
 #else
     __currentContext = g;

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_init.c

@@ -145 +145 @@
 }
 
+#ifdef CHROMIUM_THREADSAFE
+static void
+crStateFreeContext(CRContext *ctx);
+static DECLCALLBACK(void) crStateContextDtor(void *pvCtx)
+{
+    crStateFreeContext((CRContext*)pvCtx);
+}
+#endif
+
 /*
  * Helper for crStateCreateContext, below.
@@ -159 +168 @@
     ctx->id = i;
 #ifdef CHROMIUM_THREADSAFE
-    ctx->cRefs = 1;
+    crTSDRefInit(ctx, crStateContextDtor);
 #endif
     ctx->flush_func = NULL;
@@ -261 +270 @@
 
 /*@todo crStateAttribDestroy*/
-void
+static void
 crStateFreeContext(CRContext *ctx)
 {
@@ -312 +321 @@
 #ifdef CHROMIUM_THREADSAFE
         SetCurrentContext(NULL);
-        CRCONTEXT_RELEASE(defaultContext);
+        crTSDRefRelease(defaultContext);
 #else
         crStateFreeContext(defaultContext);
@@ -448 +457 @@
 
 #ifdef CHROMIUM_THREADSAFE
-    CRCONTEXT_RELEASE(ctx);
+    crTSDRefRelease(ctx);
 #else
     crStateFreeContext(ctx);