Changeset 51356 in vbox

Timestamp:

May 22, 2014 1:08:14 PM (11 years ago)

Author:

vboxsync

Message:

crOpenGL: save state for pended command blocks

Location:

trunk/src/VBox

Files:

• GuestHost/OpenGL/include/cr_version.h (modified) (1 diff)
• HostServices/SharedOpenGL/crserverlib/server.h (modified) (1 diff)
• HostServices/SharedOpenGL/crserverlib/server_main.c (modified) (5 diffs)
• HostServices/SharedOpenGL/crserverlib/server_stream.c (modified) (3 diffs)

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

@@ -44 +44 @@
 #define SHCROGL_SSM_VERSION_WITH_SCREEN_MAP                         45
 #define SHCROGL_SSM_VERSION_WITH_SCREEN_MAP_REORDERED               46
-#define SHCROGL_SSM_VERSION                                         46
+#define SHCROGL_SSM_VERSION_WITH_PEND_CMD_INFO                      47
+#define SHCROGL_SSM_VERSION                                         47
 
 /* These define the Chromium release number.

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server.h

@@ -476 +476 @@
 int8_t crVBoxServerCrCmdFlipProcess(const VBOXCMDVBVA_FLIP *pFlip);
 
+
+int32_t crVBoxServerClientGet(uint32_t u32ClientID, CRClient **ppClient);
+
+int crServerPendSaveState(PSSMHANDLE pSSM);
+int crServerPendLoadState(PSSMHANDLE pSSM, uint32_t u32Version);
+
 //#define VBOX_WITH_CRSERVER_DUMPER
 #ifdef VBOX_WITH_CRSERVER_DUMPER

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c

@@ -83 +83 @@
 }
 
-DECLINLINE(int32_t) crVBoxServerClientGet(uint32_t u32ClientID, CRClient **ppClient)
+int32_t crVBoxServerClientGet(uint32_t u32ClientID, CRClient **ppClient)
 {
     CRClient *pClient = NULL;
@@ -1838 +1838 @@
     }
 
+    rc = crServerPendSaveState(pSSM);
+    AssertRCReturn(rc, rc);
+
     rc = CrPMgrSaveState(pSSM);
     AssertRCReturn(rc, rc);
@@ -2733 +2736 @@
     cr_server.curClient = NULL;
 
+    rc = crServerPendLoadState(pSSM, version);
+    AssertRCReturn(rc, rc);
+
     if (version >= SHCROGL_SSM_VERSION_WITH_SCREEN_INFO)
     {
@@ -3646 +3652 @@
     return VINF_SUCCESS;
 }
-
 
 static DECLCALLBACK(int) crVBoxCrCmdSaveState(HVBOXCRCMDSVR hSvr, PSSMHANDLE pSSM)
@@ -4311 +4316 @@
     Assert(!cr_server.fCrCmdEnabled);
 
-    if (cr_server.numClients)
-    {
-        WARN(("cr_server.numClients(%d) is not NULL", cr_server.numClients));
-        return VERR_INVALID_STATE;
-    }
+    Assert(!cr_server.numClients);
+
+    crVBoxServerRemoveAllClients();
+
+    CRASSERT(!cr_server.numClients);
 
     crVBoxServerDefaultContextClear();

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_stream.c

@@ -419 +419 @@
 {
     RTLISTNODE Node;
+    uint32_t cbMsg;
     CRMessage Msg;
 } CR_SERVER_PENDING_MSG;
@@ -424 +425 @@
 static int crServerPendMsg(CRConnection *conn, const CRMessage *msg, int cbMsg)
 {
-    CR_SERVER_PENDING_MSG *pMsg = (CR_SERVER_PENDING_MSG*)RTMemAlloc(cbMsg + RT_OFFSETOF(CR_SERVER_PENDING_MSG, Msg));
+    CR_SERVER_PENDING_MSG *pMsg;
+
+    if (!cbMsg)
+    {
+        WARN(("cbMsg is null!"));
+        return VERR_INVALID_PARAMETER;
+    }
+
+    pMsg = (CR_SERVER_PENDING_MSG*)RTMemAlloc(cbMsg + RT_OFFSETOF(CR_SERVER_PENDING_MSG, Msg));
     if (!pMsg)
     {
@@ -431 +440 @@
     }
 
+    pMsg->cbMsg = cbMsg;
+
     memcpy(&pMsg->Msg, msg, cbMsg);
 
     RTListAppend(&conn->PendingMsgList, &pMsg->Node);
+
+    return VINF_SUCCESS;
+}
+
+int crServerPendSaveState(PSSMHANDLE pSSM)
+{
+    int i, rc;
+
+    for (i = 0; i < cr_server.numClients; i++)
+    {
+        CR_SERVER_PENDING_MSG *pIter;
+        CRClient *pClient = cr_server.clients[i];
+        CRConnection *pConn;
+        if (!pClient || !pClient->conn)
+        {
+            WARN(("invalid client state"));
+            continue;
+        }
+
+        pConn = pClient->conn;
+
+        if (RTListIsEmpty(&pConn->PendingMsgList))
+            continue;
+
+        CRASSERT(pConn->u32ClientID);
+
+        rc = SSMR3PutU32(pSSM, pConn->u32ClientID);
+        AssertRCReturn(rc, rc);
+
+        RTListForEach(&pConn->PendingMsgList, pIter, CR_SERVER_PENDING_MSG, Node)
+        {
+            CRASSERT(pIter->cbMsg);
+
+            rc = SSMR3PutU32(pSSM, pIter->cbMsg);
+            AssertRCReturn(rc, rc);
+
+            rc = SSMR3PutMem(pSSM, &pIter->Msg, pIter->cbMsg);
+            AssertRCReturn(rc, rc);
+        }
+
+        rc = SSMR3PutU32(pSSM, 0);
+        AssertRCReturn(rc, rc);
+    }
+
+    rc = SSMR3PutU32(pSSM, 0);
+    AssertRCReturn(rc, rc);
+
+    return VINF_SUCCESS;
+}
+
+int crServerPendLoadState(PSSMHANDLE pSSM, uint32_t u32Version)
+{
+    int rc;
+    uint32_t u32;
+    CRClient *pClient;
+
+    if (u32Version < SHCROGL_SSM_VERSION_WITH_PEND_CMD_INFO)
+        return VINF_SUCCESS;
+
+    rc = SSMR3GetU32(pSSM, &u32);
+    AssertRCReturn(rc, rc);
+
+    if (!u32)
+        return VINF_SUCCESS;
+
+    do {
+        rc = crVBoxServerClientGet(u32, &pClient);
+        AssertRCReturn(rc, rc);
+
+        for(;;)
+        {
+            CR_SERVER_PENDING_MSG *pMsg;
+
+            rc = SSMR3GetU32(pSSM, &u32);
+            AssertRCReturn(rc, rc);
+
+            if (!u32)
+                break;
+
+            pMsg = (CR_SERVER_PENDING_MSG*)RTMemAlloc(u32 + RT_OFFSETOF(CR_SERVER_PENDING_MSG, Msg));
+            if (!pMsg)
+            {
+                WARN(("RTMemAlloc failed"));
+                return VERR_NO_MEMORY;
+            }
+
+            pMsg->cbMsg = u32;
+            rc = SSMR3GetMem(pSSM, &pMsg->Msg, u32);
+            AssertRCReturn(rc, rc);
+
+            RTListAppend(&pClient->conn->PendingMsgList, &pMsg->Node);
+        }
+
+        rc = SSMR3GetU32(pSSM, &u32);
+        AssertRCReturn(rc, rc);
+    } while (u32);
+
+    rc = SSMR3GetU32(pSSM, &u32);
+    AssertRCReturn(rc, rc);
 
     return VINF_SUCCESS;