Changeset 42485 in vbox

Timestamp:

Jul 31, 2012 4:13:53 PM (12 years ago)

Author:

vboxsync

Message:

Guest Control 2.0: Update.

Location:

trunk/src/VBox/Main

Files:

• include/GuestCtrlImplPrivate.h (modified) (1 diff)
• include/GuestSessionImpl.h (modified) (2 diffs)
• src-client/GuestCtrlPrivate.cpp (modified) (2 diffs)
• src-client/GuestProcessImpl.cpp (modified) (5 diffs)
• src-client/GuestSessionImpl.cpp (modified) (5 diffs)

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

@@ -37 +37 @@
 #endif
 
+#ifdef LOG_GROUP
+ #undef LOG_GROUP
+#endif
 #define LOG_GROUP LOG_GROUP_GUEST_CONTROL
 #include <VBox/log.h>

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

@@ -140 +140 @@
     struct Data
     {
-        /** Guest control protocol version.
-         *  Guest control prior to VBox 4.2 has version 1,
-         *  guest control 2.0 has ...well, 2. */
+        /** Guest control protocol version to be used.
+         *  Guest Additions < VBox 4.2 have version 1,
+         *  any newer version will have version 2. */
         uint32_t             mProtocolVersion;
         /** Flag indicating if this is an internal session
@@ -157 +157 @@
         /** The session timeout. Default is 30s. */
         ULONG                mTimeout;
+        /** The next process ID for assignment. */
+        ULONG                mNextProcessID;
+        /** The session's environment block. Can be
+         *  overwritten/extended by ProcessCreate(Ex). */
         GuestEnvironment     mEnvironment;
+        /** Directory objects bound to this session. */
         SessionDirectories   mDirectories;
+        /** File objects bound to this session. */
         SessionFiles         mFiles;
+        /** Process objects bound to this session. */
         SessionProcesses     mProcesses;
     } mData;

trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp

@@ -150 +150 @@
     Assert((pvData == NULL) && !cbData);
 
-    int rc = VINF_SUCCESS;
     switch (enmType)
     {
@@ -185 +184 @@
     }
 
+    int rc = GuestCtrlEvent::Init();
     if (RT_SUCCESS(rc))
-    {
-        rc = GuestCtrlEvent::Init();
-        if (RT_SUCCESS(rc))
-            mType  = enmType;
-    }
+        mType  = enmType;
 
     LogFlowFuncLeaveRC(rc);

trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp

@@ -318 +318 @@
     /* Create a new context ID and assign it. */
     int rc = VERR_NOT_FOUND;
+
+    ULONG uCount = mData.mNextContextID++;
     ULONG uNewContextID = 0;
     ULONG uTries = 0;
     for (;;)
     {
+        if (uCount == VBOX_GUESTCTRL_MAX_CONTEXTS)
+            uCount = 0;
+
         /* Create a new context ID ... */
         uNewContextID = VBOX_GUESTCTRL_CONTEXTID_MAKE(uSessionID,
-                                                      mData.mProcessID, mData.mNextContextID);
-        if (mData.mNextContextID == VBOX_GUESTCTRL_MAX_CONTEXTS)
-            mData.mNextContextID = 0;
+                                                      mData.mProcessID, uCount);
+
         /* Is the context ID already used?  Try next ID ... */
-        if (!callbackExists(uNewContextID))
+        if (!callbackExists(uCount))
         {
             /* Callback with context ID was not found. This means
@@ -336 +340 @@
             break;
         }
-        mData.mNextContextID++;
-
+
+        uCount++;
         if (++uTries == UINT32_MAX)
             break; /* Don't try too hard. */
@@ -348 +352 @@
          *       the session + process ID), just the context count
          *       will be used here. */
-        mData.mCallbacks[mData.mNextContextID] = pCallback;
+        mData.mCallbacks[uCount] = pCallback;
         Assert(mData.mCallbacks.size());
 
@@ -356 +360 @@
 
         LogFlowThisFunc(("Added new callback (Session: %RU32, Process: %RU32, Count=%RU32) CID=%RU32\n",
-                     uSessionID, mData.mProcessID, mData.mNextContextID, uNewContextID));
+                     uSessionID, mData.mProcessID, uCount, uNewContextID));
     }
 
@@ -784 +788 @@
     {
         if (pData->pvData && pData->cbData)
+        {
             rc = pCallback->FillData(pData->pvData, pData->cbData);
+            Assert(pCallback->GetPayloadSize() == pData->cbData);
+        }
 
         int rc2 = pCallback->Signal();

trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp

@@ -76 +76 @@
     mData.mName = aName;
 
+    mData.mNextProcessID = 0;
+
     /* Confirm a successful initialization when it's the case. */
     autoInitSpan.setSucceeded();
@@ -482 +484 @@
 
     /* Create a new (host-based) process ID and assign it. */
-    ULONG uNewProcessID = 0;
     ULONG uTries = 0;
 
@@ -488 +489 @@
     {
         /* Is the context ID already used? */
-        if (!processExists(uNewProcessID, NULL /* pProgress */))
+        if (!processExists(mData.mNextProcessID, NULL /* pProgress */))
         {
             /* Callback with context ID was not found. This means
@@ -496 +497 @@
             break;
         }
-        uNewProcessID++;
+        mData.mNextProcessID++;
+        if (mData.mNextProcessID == UINT32_MAX)
+            mData.mNextProcessID = 0;
 
         if (++uTries == UINT32_MAX)
@@ -510 +513 @@
 
         rc = pProcess->init(mData.mParent->getConsole() /* Console */, this /* Session */,
-                            uNewProcessID, procInfo);
+                            mData.mNextProcessID, procInfo);
         if (RT_FAILURE(rc)) throw rc;
 
         /* Add the created process to our map. */
-        mData.mProcesses[uNewProcessID] = pProcess;
+        mData.mProcesses[mData.mNextProcessID] = pProcess;
 
         LogFlowFunc(("Added new process (Session: %RU32) with process ID=%RU32\n",
-                     mData.mId, uNewProcessID));
+                     mData.mId, mData.mNextProcessID));
     }
     catch (int rc2)