Changeset 28297 in vbox for trunk/src/VBox

Timestamp:

Apr 14, 2010 12:17:11 PM (15 years ago)

Author:

vboxsync

Message:

Guest Control: Update (update on contexts for callbacks).

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxService/VBoxServiceControlExec.cpp (modified) (5 diffs)
• Main/GuestImpl.cpp (modified) (9 diffs)
• Main/include/GuestImpl.h (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlExec.cpp

@@ -265 +265 @@
      */
     AssertPtr(pData);
+    VBoxServiceVerbose(3, "Control: Process started: PID=%u, CID=%u\n", 
+                       pData->uPID, pData->uContextID);
     rc = VbglR3GuestCtrlExecReportStatus(pData->uClientID, pData->uContextID,
                                          pData->uPID, PROC_STS_STARTED, 0 /* u32Flags */, 
@@ -451 +453 @@
         }
        
-        VBoxServiceVerbose(3, "Control: Process ended: PID=%u, Status=%u, Flags=%u\n", 
-                           pData->uPID, uStatus, uFlags);
+        VBoxServiceVerbose(3, "Control: Process ended: PID=%u, CID=%u, Status=%u, Flags=%u\n", 
+                           pData->uPID, pData->uContextID, uStatus, uFlags);
         rc = VbglR3GuestCtrlExecReportStatus(pData->uClientID, pData->uContextID,
                                              pData->uPID, uStatus, uFlags,
@@ -528 +530 @@
     /* ClientID will be assigned when thread is started! */
     pData->uContextID = u32ContextID;
+    pData->uPID = 0; /* Don't have a PID yet. */
     pData->pszCmd = RTStrDup(pszCmd);
     pData->uFlags = uFlags;
@@ -679 +682 @@
                                 if (RT_SUCCESS(rc))
                                 {
-                                    VBoxServiceVerbose(3, "Control: Process \"%s\" started.\n", pData->pszCmd);
-                                    /** @todo Dump a bit more info here. */
-
                                     /*
                                      * Close the child ends of any pipes and redirected files.
@@ -735 +735 @@
 
     VbglR3GuestCtrlDisconnect(pData->uClientID);
-    VBoxServiceVerbose(3, "Control: Thread of process \"%s\" ended with rc=%Rrc\n", pData->pszCmd, rc);
+    VBoxServiceVerbose(3, "Control: Thread of process \"%s\" (PID: %u) ended with rc=%Rrc\n", 
+                       pData->pszCmd, pData->uPID, rc);
 
     /*

trunk/src/VBox/Main/GuestImpl.cpp

@@ -109 +109 @@
 {
     LogFlowThisFunc(("\n"));
+
+#ifdef VBOX_WITH_GUEST_CONTROL
+    /* Clean up callback data. */
+    CallbackListIter it;
+    for (it = mCallbackList.begin(); it != mCallbackList.end(); it++)
+        removeCtrlCallbackContext(it);
+#endif
 
     /* Enclose the state transition Ready->InUninit->NotReady */
@@ -487 +494 @@
     int rc = VINF_SUCCESS;
 
-  /*  bool bFound = false;
-    for (int i=0; i<mList.size(); i++)
-    {
-    }
-    if(pData->hdr.u32ContextID == it->hdr.u32ContextID)
-    {
-    }*/
-    /*pExt->pid = pCBData->pid;
-    pExt->status = pCBData->status;
-    pExt->flags = pCBData->flags;*/
-    /** @todo Copy void* buffer! */
-
+    AssertPtr(pData);
+    CallbackListIter it = getCtrlCallbackContext(pData->hdr.u32ContextID);
+    if (it != mCallbackList.end())
+    {
+        PHOSTEXECCALLBACKDATA pCBData = (HOSTEXECCALLBACKDATA*)it->pvData;
+        AssertPtr(pCBData);
+
+        pCBData->u32PID = pData->u32PID;
+        pCBData->u32Status = pData->u32Status;
+        pCBData->u32Flags = pData->u32Flags;
+        /* @todo Copy void* buffer contents! */
+
+        ASMAtomicWriteBool(&it->bCalled, true);
+    }
     return rc;
 }
 
-void Guest::freeCtrlCallbackContextData(CallbackContext *pContext)
-{
-    AssertPtr(pContext);
-    if (pContext->cbData)
-    {
-        RTMemFree(pContext->pvData);
-        pContext->cbData = 0;
-        pContext->pvData = NULL;
-    }
+Guest::CallbackListIter Guest::getCtrlCallbackContext(uint32_t u32ContextID)
+{
+    CallbackListIter it;
+    for (it = mCallbackList.begin(); it != mCallbackList.end(); it++)
+    {
+        if (it->mContextID == u32ContextID)
+            return (it);
+    }
+    return it;
+}
+
+void Guest::removeCtrlCallbackContext(Guest::CallbackListIter it)
+{
+    if (it->cbData)
+    {
+        RTMemFree(it->pvData);
+        it->cbData = 0;
+        it->pvData = NULL;
+    }
+    mCallbackList.erase(it);
 }
 
@@ -520 +540 @@
     CallbackContext context;
     context.mContextID = uNewContext;
+    context.bCalled = false;
     context.pvData = pvData;
     context.cbData = cbData;
 
     mCallbackList.push_back(context);
-    if (mCallbackList.size() > 256)
-    {
-        freeCtrlCallbackContextData(&mCallbackList.front());
-        mCallbackList.pop_front();
-    }
+    if (mCallbackList.size() > 256) /* Don't let the container size get too big! */
+        removeCtrlCallbackContext(mCallbackList.begin());
+
     return uNewContext;
 }
@@ -592 +611 @@
         if (RT_SUCCESS(vrc))
         {
+            uint32_t uContextID = 0;
+
             char *pszArgs = NULL;
             if (uNumArgs > 0)
@@ -623 +644 @@
                     PHOSTEXECCALLBACKDATA pData = (HOSTEXECCALLBACKDATA*)RTMemAlloc(sizeof(HOSTEXECCALLBACKDATA));
                     AssertPtr(pData);
-                    uint32_t uContextID = addCtrlCallbackContext(pData, sizeof(HOSTEXECCALLBACKDATA));
+                    uContextID = addCtrlCallbackContext(pData, sizeof(HOSTEXECCALLBACKDATA));
+                    Assert(uContextID > 0);
 
                     VBOXHGCMSVCPARM paParms[15];
@@ -664 +686 @@
                  * get the PID.
                  */
-#if 0
+                CallbackListIter it = getCtrlCallbackContext(uContextID);
                 uint64_t u64Started = RTTimeMilliTS();
                 do
@@ -679 +701 @@
                     }
                     RTThreadSleep(100);
-                } while (!callbackData.called);
+                } while (it != mCallbackList.end() && !it->bCalled);
 
                 /* Did we get some status? */
-                if (callbackData.called)
+                PHOSTEXECCALLBACKDATA pData = (HOSTEXECCALLBACKDATA*)it->pvData;
+                Assert(it->cbData, sizeof(HOSTEXECCALLBACKDATA));
+                AssertPtr(pData);
+                if (it->bCalled)
                 {
-                    switch (callbackData.status)
+                    switch (pData->u32Status)
                     {
                         case PROC_STS_STARTED:
-                            *aPID = callbackData.pid;
+                            *aPID = pData->u32PID;
                             break;
 
                         case PROC_STS_ERROR:
-                            vrc = callbackData.flags; /* flags member contains IPRT error code. */
+                            vrc = pData->u32Flags; /* u32Flags member contains IPRT error code. */
                             break;
 
@@ -699 +724 @@
                     }
                 }
+                removeCtrlCallbackContext(it);
 
                 if (RT_FAILURE(vrc))
@@ -713 +739 @@
                     }
                 }
-#endif
 #if 0
                 progress.queryInterfaceTo(aProgress);

trunk/src/VBox/Main/include/GuestImpl.h

@@ -118 +118 @@
 
 # ifdef VBOX_WITH_GUEST_CONTROL
-
     struct CallbackContext
     {
-        uint32_t  mContextID;
-        void     *pvData;
-        uint32_t  cbData;
+        uint32_t        mContextID;
+        void           *pvData;
+        uint32_t        cbData;
+        /** Atomic flag whether callback was called. */
+        volatile bool   bCalled;
     };
+    typedef std::list< CallbackContext > CallbackList;
+    typedef std::list< CallbackContext >::iterator CallbackListIter;
+    typedef std::list< CallbackContext >::const_iterator CallbackListIterConst;
 
     int prepareExecuteArgs(const char *pszArgs, void **ppvList, uint32_t *pcbList, uint32_t *pcArgs);
@@ -130 +134 @@
     /** Handler for guest execution control notifications. */
     int notifyCtrlExec(uint32_t u32Function, PHOSTEXECCALLBACKDATA pData);
-    void freeCtrlCallbackContextData(CallbackContext *pContext);
+    CallbackListIter getCtrlCallbackContext(uint32_t u32ContextID);
+    void removeCtrlCallbackContext(CallbackListIter it);
     uint32_t addCtrlCallbackContext(void *pvData, uint32_t cbData);
 # endif
@@ -158 +163 @@
         
     volatile uint32_t mNextContextID;
-    typedef std::list< CallbackContext > CallbackList;
     CallbackList mCallbackList;
 # endif