Changeset 39847 in vbox for trunk

Timestamp:

Jan 24, 2012 9:39:23 AM (13 years ago)

Author:

vboxsync

Message:

crOpenGL: fix saved state issues

Location:

trunk

Files:

• include/VBox/VBoxVideo3D.h (modified) (2 diffs)
• src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c (modified) (5 diffs)

trunk/include/VBox/VBoxVideo3D.h

@@ -60 +60 @@
 #define VBOXTLSREFDATA \
     volatile int32_t cTlsRefs; \
-    uint32_t enmTlsRefState; \
+    VBOXTLSREFDATA_STATE enmTlsRefState; \
     PFNVBOXTLSREFDTOR pfnTlsRefDtor; \
+
+struct VBOXTLSREFDATA_DUMMY
+{
+    VBOXTLSREFDATA
+};
+
+#define VBOXTLSREFDATA_OFFSET(_t) RT_OFFSETOF(_t, cTlsRefs)
+#define VBOXTLSREFDATA_SIZE() (sizeof (struct VBOXTLSREFDATA_DUMMY))
+#define VBOXTLSREFDATA_COPY(_pDst, _pSrc) do { \
+        (_pDst)->cTlsRefs = (_pSrc)->cTlsRefs; \
+        (_pDst)->enmTlsRefState = (_pSrc)->enmTlsRefState; \
+        (_pDst)->pfnTlsRefDtor = (_pSrc)->pfnTlsRefDtor; \
+    } while (0)
+
+#define VBOXTLSREFDATA_EQUAL(_pDst, _pSrc) ( \
+           (_pDst)->cTlsRefs == (_pSrc)->cTlsRefs \
+        && (_pDst)->enmTlsRefState == (_pSrc)->enmTlsRefState \
+        && (_pDst)->pfnTlsRefDtor == (_pSrc)->pfnTlsRefDtor \
+    )
+
 
 #define VBoxTlsRefInit(_p, _pfnDtor) do { \
@@ -85 +105 @@
     } while (0)
 
-#define VBoxTlsRefReleaseMarkDestroy(_p) do { \
+#define VBoxTlsRefMarkDestroy(_p) do { \
         (_p)->enmTlsRefState = VBOXTLSREFDATA_STATE_TOBE_DESTROYED; \
     } while (0)

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

@@ -1019 +1019 @@
     pContext->buffer.storedHeight = pContext->buffer.height;
 
-    rc = SSMR3PutMem(pSSM, pContext, sizeof(*pContext));
+    CRASSERT(VBoxTlsRefIsFunctional(pContext));
+
+    /* do not increment the saved state version due to VBOXTLSREFDATA addition to CRContext */
+    rc = SSMR3PutMem(pSSM, pContext, VBOXTLSREFDATA_OFFSET(CRContext));
+    AssertRCReturn(rc, rc);
+
+    /* now store bitid & neg_bitid */
+    rc = SSMR3PutMem(pSSM, pContext->bitid, sizeof (pContext->bitid) + sizeof (pContext->neg_bitid));
+    AssertRCReturn(rc, rc);
+
+    /* the pre-VBOXTLSREFDATA CRContext structure might have additional allignment bits before the CRContext::shared */
+    ui32 = VBOXTLSREFDATA_OFFSET(CRContext) + sizeof (pContext->bitid) + sizeof (pContext->neg_bitid);
+    ui32 &= (sizeof (void*) - 1);
+    if (ui32)
+    {
+        void* pTmp = NULL;
+        rc = SSMR3PutMem(pSSM, &pTmp, ui32);
+        AssertRCReturn(rc, rc);
+    }
+
+    rc = SSMR3PutMem(pSSM, &pContext->shared, sizeof (CRContext) - RT_OFFSETOF(CRContext, shared));
     AssertRCReturn(rc, rc);
 
@@ -1379 +1399 @@
 #define SLC_ASSSERT_NULL_PTR(ptr) CRASSERT(!pContext->ptr)
 
+AssertCompile(VBOXTLSREFDATA_SIZE() <= CR_MAX_BITARRAY);
+AssertCompile(VBOXTLSREFDATA_STATE_INITIALIZED != 0);
+AssertCompile(RT_OFFSETOF(CRContext, shared) >= VBOXTLSREFDATA_OFFSET(CRContext) + VBOXTLSREFDATA_SIZE() + RT_SIZEOFMEMB(CRContext, bitid) + RT_SIZEOFMEMB(CRContext, neg_bitid));
+
 int32_t crStateLoadContext(CRContext *pContext, CRHashTable * pCtxTable, PSSMHANDLE pSSM)
 {
@@ -1386 +1410 @@
     unsigned long key;
     GLboolean bLoadShared = GL_TRUE;
+    union {
+        CRbitvalue bitid[CR_MAX_BITARRAY];
+        struct {
+            VBOXTLSREFDATA
+        } tlsRef;
+    } bitid;
 
     CRASSERT(pContext && pSSM);
@@ -1394 +1424 @@
         return VERR_NO_MEMORY;
 
-    rc = SSMR3GetMem(pSSM, pTmpContext, sizeof(*pTmpContext));
+    CRASSERT(VBoxTlsRefIsFunctional(pContext));
+
+    /* do not increment the saved state version due to VBOXTLSREFDATA addition to CRContext */
+    rc = SSMR3GetMem(pSSM, pTmpContext, VBOXTLSREFDATA_OFFSET(CRContext));
+    AssertRCReturn(rc, rc);
+
+    /* VBox 4.1.8 had a bug that VBOXTLSREFDATA was also stored in the snapshot,
+     * thus the saved state data format was changed w/o changing the saved state version.
+     * here we determine whether the saved state contains VBOXTLSREFDATA, and if so, treat it accordingly */
+    rc = SSMR3GetMem(pSSM, &bitid, sizeof (bitid));
+    AssertRCReturn(rc, rc);
+
+    /* the bitid array has one bit set only. this is why if bitid.tlsRef has both cTlsRefs
+     * and enmTlsRefState non-zero - this is definitely NOT a bit id and is a VBOXTLSREFDATA */
+    if (bitid.tlsRef.enmTlsRefState == VBOXTLSREFDATA_STATE_INITIALIZED
+            && bitid.tlsRef.cTlsRefs)
+    {
+        /* VBOXTLSREFDATA is stored, skip it */
+        crMemcpy(&pTmpContext->bitid, ((uint8_t*)&bitid) + VBOXTLSREFDATA_SIZE(), sizeof (bitid) - VBOXTLSREFDATA_SIZE());
+        rc = SSMR3GetMem(pSSM, ((uint8_t*)&pTmpContext->bitid) + VBOXTLSREFDATA_SIZE(), sizeof (pTmpContext->bitid) + sizeof (pTmpContext->neg_bitid) - VBOXTLSREFDATA_SIZE());
+        AssertRCReturn(rc, rc);
+
+        ui = VBOXTLSREFDATA_OFFSET(CRContext) + VBOXTLSREFDATA_SIZE() + sizeof (pTmpContext->bitid) + sizeof (pTmpContext->neg_bitid);
+        ui = RT_OFFSETOF(CRContext, shared) - ui;
+    }
+    else
+    {
+        /* VBOXTLSREFDATA is NOT stored */
+        crMemcpy(&pTmpContext->bitid, &bitid, sizeof (bitid));
+        rc = SSMR3GetMem(pSSM, &pTmpContext->neg_bitid, sizeof (pTmpContext->neg_bitid));
+        AssertRCReturn(rc, rc);
+
+        /* the pre-VBOXTLSREFDATA CRContext structure might have additional allignment bits before the CRContext::shared */
+        ui = VBOXTLSREFDATA_OFFSET(CRContext) + sizeof (pTmpContext->bitid) + sizeof (pTmpContext->neg_bitid);
+
+        ui &= (sizeof (void*) - 1);
+    }
+
+    if (ui)
+    {
+        void* pTmp = NULL;
+        rc = SSMR3GetMem(pSSM, &pTmp, ui);
+        AssertRCReturn(rc, rc);
+    }
+
+    /* we will later do crMemcpy from entire pTmpContext to pContext,
+     * for simplicity store the VBOXTLSREFDATA from the pContext to pTmpContext */
+    VBOXTLSREFDATA_COPY(pTmpContext, pContext);
+
+    rc = SSMR3GetMem(pSSM, &pTmpContext->shared, sizeof (CRContext) - RT_OFFSETOF(CRContext, shared));
     AssertRCReturn(rc, rc);
 
@@ -1567 +1646 @@
     /* Have to preserve original context id */
     CRASSERT(pTmpContext->id == pContext->id);
+    CRASSERT(VBOXTLSREFDATA_EQUAL(pContext, pTmpContext));
     /* Copy ordinary state to real context */
     crMemcpy(pContext, pTmpContext, sizeof(*pTmpContext));