Changeset 49504 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Nov 15, 2013 1:19:45 PM (11 years ago)

Author:

vboxsync

Message:

Main/GuestCtrl: Reference counting bugfixes, handle more directoryCreate errors.

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestCtrlImpl.cpp (modified) (3 diffs)
• GuestDirectoryImpl.cpp (modified) (2 diffs)
• GuestFileImpl.cpp (modified) (7 diffs)
• GuestFsObjInfoImpl.cpp (modified) (1 diff)
• GuestProcessImpl.cpp (modified) (22 diffs)
• GuestSessionImpl.cpp (modified) (23 diffs)

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

@@ -347 +347 @@
     int rc = VERR_NOT_FOUND;
 
-    LogFlowFunc(("Closing session (ID=%RU32) ...\n", pSession->getId()));
+    LogFlowThisFunc(("Removing session (ID=%RU32) ...\n", pSession->getId()));
 
     GuestSessions::iterator itSessions = mData.mGuestSessions.begin();
@@ -354 +354 @@
         if (pSession == itSessions->second)
         {
+#ifdef DEBUG_andy
+            ULONG cRefs = pSession->AddRef();
+            Assert(cRefs >= 2);
+            LogFlowThisFunc(("pCurSession=%p, cRefs=%RU32\n", pSession, cRefs - 2));
+            pSession->Release();
+#endif
             /* Make sure to consume the pointer before the one of the
              * iterator gets released. */
             ComObjPtr<GuestSession> pCurSession = pSession;
 
-            LogFlowFunc(("Removing session (pSession=%p, ID=%RU32) (now total %ld sessions)\n",
-                         pSession, pSession->getId(), mData.mGuestSessions.size() - 1));
-
-            itSessions->second->Release();
-
+            LogFlowThisFunc(("Removing session (pSession=%p, ID=%RU32) (now total %ld sessions)\n",
+                             pSession, pSession->getId(), mData.mGuestSessions.size() - 1));
+
+            rc = pSession->onRemove();
             mData.mGuestSessions.erase(itSessions);
 
@@ -369 +374 @@
             fireGuestSessionRegisteredEvent(mEventSource, pCurSession,
                                             false /* Unregistered */);
-            rc = VINF_SUCCESS;
+            pCurSession.setNull();      
             break;
         }

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

@@ -133 +133 @@
 void GuestDirectory::uninit(void)
 {
-    LogFlowThisFunc(("\n"));
+    LogFlowThisFuncEnter();
 
     /* Enclose the state transition Ready->InUninit->NotReady. */
@@ -246 +246 @@
 
     return strError;
+}
+
+/**
+ * Called by IGuestSession right before this directory gets 
+ * removed from the public directory list. 
+ */
+int GuestDirectory::onRemove(void)
+{
+    LogFlowThisFuncEnter();
+
+    int vrc = VINF_SUCCESS;
+         
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 

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

@@ -1 @@
-
 /* $Id$ */
 /** @file
@@ -79 +78 @@
                 int rc2 = mFile->signalWaitEvent(aType, aEvent);
 #ifdef DEBUG_andy
-                LogFlowFunc(("Signalling events of type=%ld, file=%p resulted in rc=%Rrc\n",
+                LogFlowFunc(("Signalling events of type=%RU32, file=%p resulted in rc=%Rrc\n",
                              aType, mFile, rc2));
 #endif
@@ -86 +85 @@
 
             default:
-                AssertMsgFailed(("Unhandled event %ld\n", aType));
+                AssertMsgFailed(("Unhandled event %RU32\n", aType));
                 break;
         }
@@ -225 +224 @@
 void GuestFile::uninit(void)
 {
-    LogFlowThisFuncEnter();
-
     /* Enclose the state transition Ready->InUninit->NotReady. */
     AutoUninitSpan autoUninitSpan(this);
@@ -232 +229 @@
         return;
 
+    LogFlowThisFuncEnter();
+
 #ifdef VBOX_WITH_GUEST_CONTROL
     baseUninit();
-
-    if (!mEventSource.isNull())
-    {
-        mEventSource->UnregisterListener(mLocalListener);
-
-        mLocalListener.setNull();
-        unconst(mEventSource).setNull();
-    }
 #endif
-
     LogFlowThisFuncLeave();
 }
@@ -707 +697 @@
 
     int vrc = setFileStatus(FileStatus_Down, VINF_SUCCESS);
+
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
+}
+
+/**
+ * Called by IGuestSession right before this file gets removed 
+ * from the public file list. 
+ */
+int GuestFile::onRemove(void)
+{
+    LogFlowThisFuncEnter();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    int vrc = VINF_SUCCESS;
+
+    /* 
+     * Note: The event source stuff holds references to this object,
+     *       so make sure that this is cleaned up *before* calling uninit().
+     */
+    if (!mEventSource.isNull())
+    {
+        mEventSource->UnregisterListener(mLocalListener);
+
+        mLocalListener.setNull();
+        unconst(mEventSource).setNull();
+    }
 
     LogFlowFuncLeaveRC(vrc);
@@ -944 +962 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    LogFlowThisFunc(("oldStatus=%ld, newStatus=%ld, fileRc=%Rrc\n",
+    LogFlowThisFunc(("oldStatus=%RU32, newStatus=%RU32, fileRc=%Rrc\n",
                      mData.mStatus, fileStatus, fileRc));
 

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

@@ -1 @@
-
 /* $Id$ */
 /** @file
- * VirtualBox Main - XXX.
+ * VirtualBox Main - Guest file system object information handling.
  */
 

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

@@ -1 @@
-
 /* $Id$ */
 /** @file
@@ -118 +117 @@
                 int rc2 = mProcess->signalWaitEvent(aType, aEvent);
 #ifdef DEBUG
-                LogFlowThisFunc(("Signalling events of type=%ld, pProcess=%p resulted in rc=%Rrc\n",
+                LogFlowThisFunc(("Signalling events of type=%RU32, pProcess=%p resulted in rc=%Rrc\n",
                                  aType, &mProcess, rc2));
 #endif
@@ -125 +124 @@
 
             default:
-                AssertMsgFailed(("Unhandled event %ld\n", aType));
+                AssertMsgFailed(("Unhandled event %RU32\n", aType));
                 break;
         }
@@ -256 +255 @@
 /**
  * Uninitializes the instance.
- * Called from FinalRelease().
+ * Called from FinalRelease() or IGuestSession::uninit().
  */
 void GuestProcess::uninit(void)
 {
-    LogFlowThisFuncEnter();
-
     /* Enclose the state transition Ready->InUninit->NotReady. */
     AutoUninitSpan autoUninitSpan(this);
@@ -267 +264 @@
         return;
 
+#ifdef VBOX_WITH_GUEST_CONTROL
     LogFlowThisFunc(("mCmd=%s, PID=%RU32\n",
                      mData.mProcess.mCommand.c_str(), mData.mPID));
@@ -276 +274 @@
      *       case of failure. */
 
-#ifdef VBOX_WITH_GUEST_CONTROL
     baseUninit();
-
-    if (!mEventSource.isNull())
-    {
-        mEventSource->UnregisterListener(mLocalListener);
-
-        mLocalListener.setNull();
-        unconst(mEventSource).setNull();
-    }
-#endif
 
     LogFlowThisFunc(("Returning rc=%Rrc, guestRc=%Rrc\n",
                      vrc, guestRc));
+#endif
 }
 
@@ -826 +815 @@
         }
 
-        LogFlowThisFunc(("Got rc=%Rrc, procSts=%ld, procRc=%Rrc\n",
+        LogFlowThisFunc(("Got rc=%Rrc, procSts=%RU32, procRc=%Rrc\n",
                          vrc, procStatus, procRc));
 
@@ -875 +864 @@
 }
 
+/**
+ * Called by IGuestSession right before this process gets 
+ * removed from the public process list. 
+ */
+int GuestProcess::onRemove(void)
+{
+    LogFlowThisFuncEnter();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    int vrc = VINF_SUCCESS;
+
+    /* 
+     * Note: The event source stuff holds references to this object,
+     *       so make sure that this is cleaned up *before* calling uninit().
+     */
+    if (!mEventSource.isNull())
+    {
+        mEventSource->UnregisterListener(mLocalListener);
+
+        mLocalListener.setNull();
+        unconst(mEventSource).setNull();
+    }
+
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
+}
+
 int GuestProcess::readData(uint32_t uHandle, uint32_t uSize, uint32_t uTimeoutMS,
                            void *pvData, size_t cbData, uint32_t *pcbRead, int *pGuestRc)
@@ -962 +979 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    LogFlowThisFunc(("oldStatus=%ld, newStatus=%ld, procRc=%Rrc\n",
+    LogFlowThisFunc(("oldStatus=%RU32, newStatus=%RU32, procRc=%Rrc\n",
                      mData.mStatus, procStatus, procRc));
 
@@ -1236 +1253 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
+    int vrc = VINF_SUCCESS;
+
     if (mData.mStatus != ProcessStatus_Started)
     {
-        LogFlowThisFunc(("Process not started state (state is %ld), skipping termination\n",
+        LogFlowThisFunc(("Process not in started state (state is %RU32), skipping termination\n",
                          mData.mStatus));
-        return VINF_SUCCESS; /* Nothing to do (anymore). */
-    }
-
-    int vrc = VINF_SUCCESS;
-
-    AssertPtr(mSession);
-    /* Note: VBox < 4.3 (aka protocol version 1) does not
-     *       support this, so just skip. */
-    if (mSession->getProtocolVersion() < 2)
-        vrc = VERR_NOT_SUPPORTED;
-
-    if (RT_SUCCESS(vrc))
-    {
-        GuestWaitEvent *pEvent = NULL;
-        GuestEventTypes eventTypes;
-        try
-        {
-            eventTypes.push_back(VBoxEventType_OnGuestProcessStateChanged);
-
-            vrc = registerWaitEvent(eventTypes, &pEvent);
-        }
-        catch (std::bad_alloc)
-        {
-            vrc = VERR_NO_MEMORY;
-        }
-
-        if (RT_FAILURE(vrc))
-            return vrc;
-
-        VBOXHGCMSVCPARM paParms[4];
-        int i = 0;
-        paParms[i++].setUInt32(pEvent->ContextID());
-        paParms[i++].setUInt32(mData.mPID);
-
-        alock.release(); /* Drop the write lock before sending. */
-
-        vrc = sendCommand(HOST_EXEC_TERMINATE, i, paParms);
+    }
+    else
+    {
+        AssertPtr(mSession);
+        /* Note: VBox < 4.3 (aka protocol version 1) does not
+         *       support this, so just skip. */
+        if (mSession->getProtocolVersion() < 2)
+            vrc = VERR_NOT_SUPPORTED;
+
         if (RT_SUCCESS(vrc))
-            vrc = waitForStatusChange(pEvent, uTimeoutMS,
-                                      NULL /* ProcessStatus */, pGuestRc);
-        unregisterWaitEvent(pEvent);
+        {
+            GuestWaitEvent *pEvent = NULL;
+            GuestEventTypes eventTypes;
+            try
+            {
+                eventTypes.push_back(VBoxEventType_OnGuestProcessStateChanged);
+
+                vrc = registerWaitEvent(eventTypes, &pEvent);
+            }
+            catch (std::bad_alloc)
+            {
+                vrc = VERR_NO_MEMORY;
+            }
+
+            if (RT_FAILURE(vrc))
+                return vrc;
+
+            VBOXHGCMSVCPARM paParms[4];
+            int i = 0;
+            paParms[i++].setUInt32(pEvent->ContextID());
+            paParms[i++].setUInt32(mData.mPID);
+
+            alock.release(); /* Drop the write lock before sending. */
+
+            vrc = sendCommand(HOST_EXEC_TERMINATE, i, paParms);
+            if (RT_SUCCESS(vrc))
+                vrc = waitForStatusChange(pEvent, uTimeoutMS,
+                                          NULL /* ProcessStatus */, pGuestRc);
+            unregisterWaitEvent(pEvent);
+        }
     }
 
@@ -1337 +1355 @@
 
                 default:
-                    AssertMsgFailed(("Unhandled old status %ld before new status 'started'\n",
+                    AssertMsgFailed(("Unhandled old status %RU32 before new status 'started'\n",
                                      oldStatus));
                     waitResult = ProcessWaitResult_Start;
@@ -1381 +1399 @@
 
 #ifdef DEBUG
-    LogFlowFunc(("oldStatus=%ld, newStatus=%ld, fWaitFlags=0x%x, waitResult=%ld\n",
+    LogFlowFunc(("oldStatus=%RU32, newStatus=%RU32, fWaitFlags=0x%x, waitResult=%RU32\n",
                  oldStatus, newStatus, fWaitFlags, waitResult));
 #endif
@@ -1478 +1496 @@
                                              mData.mProcess.mFlags, mSession->getProtocolVersion());
 #ifdef DEBUG
-            LogFlowThisFunc(("Got new status change: fWaitFlags=0x%x, newStatus=%ld, waitResult=%ld\n",
+            LogFlowThisFunc(("Got new status change: fWaitFlags=0x%x, newStatus=%RU32, waitResult=%RU32\n",
                              fWaitFlags, newStatus, waitResult));
 #endif
@@ -1492 +1510 @@
     unregisterWaitEvent(pEvent);
 
-    LogFlowThisFunc(("Returned waitResult=%ld, newStatus=%ld, rc=%Rrc\n",
+    LogFlowThisFunc(("Returned waitResult=%RU32, newStatus=%RU32, rc=%Rrc\n",
                      waitResult, newStatus, vrc));
     return vrc;
@@ -1860 +1878 @@
     }
 
-    /* Remove the process from our internal session list. Only an API client
-     * now may hold references to it. */
+    /* Remove process from guest session list. Now only API clients
+     * still can hold references to it. */
     AssertPtr(mSession);
     mSession->processRemoveFromList(this);
@@ -2016 +2034 @@
 
 GuestProcessTool::GuestProcessTool(void)
-    : pSession(NULL)
+    : pSession(NULL),
+      pProcess(NULL)
 {
 }
@@ -2041 +2060 @@
     int vrc = pSession->processCreateExInteral(mStartupInfo, pProcess);
     if (RT_SUCCESS(vrc))
-        vrc = fAsync ? pProcess->startProcessAsync() : pProcess->startProcess(30 * 1000 /* 30s timeout */,
-                                                                              pGuestRc);
+        vrc = fAsync 
+            ? pProcess->startProcessAsync() 
+            : pProcess->startProcess(30 * 1000 /* 30s timeout */, pGuestRc);
 
     if (   RT_SUCCESS(vrc)
@@ -2091 +2111 @@
     Assert(SUCCEEDED(hr));
 
-    if (   procStatus != ProcessStatus_Started
-        && procStatus != ProcessStatus_Paused
-        && procStatus != ProcessStatus_Terminating)
-    {
-        return false;
-    }
-
-    return true;
+    if (   procStatus == ProcessStatus_Started
+        || procStatus == ProcessStatus_Paused
+        || procStatus == ProcessStatus_Terminating)
+    {
+        return true;
+    }
+
+    return false;
 }
 
@@ -2147 +2167 @@
         Assert(RT_SUCCESS(guestRc));
         guestRc = procTool.TerminatedOk(NULL /* Exit code */);
+        if (RT_FAILURE(guestRc))
+            vrc = VERR_GSTCTL_GUEST_ERROR;                        
         if (pGuestRc)
             *pGuestRc = guestRc;
@@ -2300 +2322 @@
 
             default:
-                AssertReleaseMsgFailed(("Unhandled process wait result %ld\n", waitRes));
+                AssertReleaseMsgFailed(("Unhandled process wait result %RU32\n", waitRes));
                 break;
         }
@@ -2368 +2390 @@
 #undef GET_REMAINING_TIME
 
-    LogFlowThisFunc(("Loop ended with rc=%Rrc, guestRc=%Rrc, waitRes=%ld\n",
+    if (RT_FAILURE(guestRc))
+        vrc = VERR_GSTCTL_GUEST_ERROR;
+
+    LogFlowThisFunc(("Loop ended with rc=%Rrc, guestRc=%Rrc, waitRes=%RU32\n",
                      vrc, guestRc, waitRes));
     if (pGuestRc)
@@ -2385 +2410 @@
     {
         rc = pProcess->terminateProcess(uTimeoutMS, pGuestRc);
-
-        Assert(pSession);
-        int rc2 = pSession->processRemoveFromList(pProcess);
-        AssertRC(rc2);
-
         pProcess.setNull();
     }

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

@@ -1 @@
-
 /* $Id$ */
 /** @file
@@ -116 +115 @@
                 int rc2 = mSession->signalWaitEvent(aType, aEvent);
 #ifdef DEBUG_andy
-                LogFlowFunc(("Signalling events of type=%ld, session=%p resulted in rc=%Rrc\n",
+                LogFlowFunc(("Signalling events of type=%RU32, session=%p resulted in rc=%Rrc\n",
                              aType, mSession, rc2));
 #endif
@@ -123 +122 @@
 
             default:
-                AssertMsgFailed(("Unhandled event %ld\n", aType));
+                AssertMsgFailed(("Unhandled event %RU32\n", aType));
                 break;
         }
@@ -274 +273 @@
 void GuestSession::uninit(void)
 {
-    LogFlowThisFuncEnter();
-
     /* Enclose the state transition Ready->InUninit->NotReady. */
     AutoUninitSpan autoUninitSpan(this);
@@ -281 +278 @@
         return;
 
+    LogFlowThisFuncEnter();
+
     int rc = VINF_SUCCESS;
 
 #ifdef VBOX_WITH_GUEST_CONTROL
-    LogFlowThisFunc(("Closing directories (%RU64 total)\n",
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); 
+
+    LogFlowThisFunc(("Closing directories (%zu total)\n",
                      mData.mDirectories.size()));
     for (SessionDirectories::iterator itDirs = mData.mDirectories.begin();
          itDirs != mData.mDirectories.end(); ++itDirs)
     {
-        itDirs->second->Release();
+        Assert(mData.mNumObjects);
+        mData.mNumObjects--;
+        itDirs->second->onRemove();
+        itDirs->second->uninit();
     }
     mData.mDirectories.clear();
 
-    LogFlowThisFunc(("Closing files (%RU64 total)\n",
+    LogFlowThisFunc(("Closing files (%zu total)\n",
                      mData.mFiles.size()));
     for (SessionFiles::iterator itFiles = mData.mFiles.begin();
          itFiles != mData.mFiles.end(); ++itFiles)
     {
-        itFiles->second->Release();
+        Assert(mData.mNumObjects);
+        mData.mNumObjects--;
+        itFiles->second->onRemove();
+        itFiles->second->uninit();
     }
     mData.mFiles.clear();
 
-    LogFlowThisFunc(("Closing processes (%RU64 total)\n",
+    LogFlowThisFunc(("Closing processes (%zu total)\n",
                      mData.mProcesses.size()));
     for (SessionProcesses::iterator itProcs = mData.mProcesses.begin();
          itProcs != mData.mProcesses.end(); ++itProcs)
     {
-        itProcs->second->Release();
+        Assert(mData.mNumObjects);
+        mData.mNumObjects--;
+        itProcs->second->onRemove();
+        itProcs->second->uninit();
     }
     mData.mProcesses.clear();
 
-    LogFlowThisFunc(("mNumObjects=%RU32\n", mData.mNumObjects));
+    AssertMsg(mData.mNumObjects == 0, 
+              ("mNumObjects=%RU32 when it should be 0\n", mData.mNumObjects));
 
     baseUninit();
-
-    if (!mEventSource.isNull())
-    {
-        mEventSource->UnregisterListener(mLocalListener);
-
-        mLocalListener.setNull();
-        unconst(mEventSource).setNull();
-    }
 #endif /* VBOX_WITH_GUEST_CONTROL */
     LogFlowFuncLeaveRC(rc);
@@ -661 +664 @@
     if (mData.mStatus != GuestSessionStatus_Started)
     {
-        LogFlowThisFunc(("Session ID=%RU32 not started (anymore), status now is: %ld\n",
+        LogFlowThisFunc(("Session ID=%RU32 not started (anymore), status now is: %RU32\n",
                          mData.mSession.mID, mData.mStatus));
         return VINF_SUCCESS;
@@ -721 +724 @@
     {
         /* Construct arguments. */
-        if (uFlags & DirectoryCreateFlag_Parents)
-            procInfo.mArguments.push_back(Utf8Str("--parents")); /* We also want to create the parent directories. */
+        if (uFlags)
+        {
+            if (uFlags & DirectoryCreateFlag_Parents)
+                procInfo.mArguments.push_back(Utf8Str("--parents")); /* We also want to create the parent directories. */
+            else
+                vrc = VERR_INVALID_PARAMETER;
+        }
+        
         if (uMode)
         {
@@ -780 +789 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    for (SessionDirectories::iterator itDirs = mData.mDirectories.begin();
-         itDirs != mData.mDirectories.end(); ++itDirs)
+    int rc = VERR_NOT_FOUND;
+
+    SessionDirectories::iterator itDirs = mData.mDirectories.begin();
+    while (itDirs != mData.mDirectories.end())
     {
         if (pDirectory == itDirs->second)
         {
+            /* Make sure to consume the pointer before the one of the
+             * iterator gets released. */
+            ComObjPtr<GuestDirectory> pDir = pDirectory;
+
             Bstr strName;
             HRESULT hr = itDirs->second->COMGETTER(DirectoryName)(strName.asOutParam());
@@ -790 +805 @@
 
             Assert(mData.mDirectories.size());
-            LogFlowFunc(("Removing directory \"%s\" (Session: %RU32) (now total %ld directories)\n",
-                         Utf8Str(strName).c_str(), mData.mSession.mID, mData.mDirectories.size() - 1));
-
+            Assert(mData.mNumObjects);
+            LogFlowFunc(("Removing directory \"%s\" (Session: %RU32) (now total %zu processes, %ld objects)\n",
+                         Utf8Str(strName).c_str(), mData.mSession.mID, mData.mDirectories.size() - 1, mData.mNumObjects - 1));
+ 
+            rc = pDirectory->onRemove();
             mData.mDirectories.erase(itDirs);
-            return VINF_SUCCESS;
-        }
-    }
-
-    return VERR_NOT_FOUND;
+            mData.mNumObjects--;
+
+            pDir.setNull();
+            break;
+        }
+
+        itDirs++;
+    }
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
 }
 
@@ -1171 +1194 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    for (SessionFiles::iterator itFiles = mData.mFiles.begin();
-         itFiles != mData.mFiles.end(); ++itFiles)
+    int rc = VERR_NOT_FOUND;    
+
+    SessionFiles::iterator itFiles = mData.mFiles.begin();
+    while (itFiles != mData.mFiles.end())
     {
         if (pFile == itFiles->second)
@@ -1188 +1213 @@
                              Utf8Str(strName).c_str(), mData.mSession.mID, mData.mFiles.size() - 1, mData.mNumObjects - 1));
 
-            pFile->cancelWaitEvents();
-            pFile->Release();
-
+            rc = pFile->onRemove();
             mData.mFiles.erase(itFiles);
             mData.mNumObjects--;
@@ -1198 +1221 @@
             fireGuestFileRegisteredEvent(mEventSource, this, pCurFile,
                                          false /* Unregistered */);
-            return VINF_SUCCESS;
-        }
-    }
-
-    return VERR_NOT_FOUND;
+            pCurFile.setNull();            
+            break;
+        }
+
+        itFiles++;
+    }
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;    
 }
 
@@ -1485 +1512 @@
 
     return S_OK;
+}
+
+/**
+ * Called by IGuest right before this session gets removed from 
+ * the public session list. 
+ */
+int GuestSession::onRemove(void)
+{
+    LogFlowThisFuncEnter();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    int vrc = VINF_SUCCESS;
+
+    /* 
+     * Note: The event source stuff holds references to this object,
+     *       so make sure that this is cleaned up *before* calling uninit.
+     */
+    if (!mEventSource.isNull())
+    {
+        mEventSource->UnregisterListener(mLocalListener);
+
+        mLocalListener.setNull();
+        unconst(mEventSource).setNull();
+    }
+
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -1756 +1811 @@
     ComAssertComRC(hr);
 
-    LogFlowFunc(("Closing process (PID=%RU32) ...\n", uPID));
+    LogFlowFunc(("Removing process (PID=%RU32) ...\n", uPID));
 
     SessionProcesses::iterator itProcs = mData.mProcesses.begin();
@@ -1763 +1818 @@
         if (pProcess == itProcs->second)
         {
-            /* Make sure to consume the pointer before the one of thfe
+#ifdef DEBUG_andy
+            ULONG cRefs = pProcess->AddRef();
+            Assert(cRefs >= 2);
+            LogFlowFunc(("pProcess=%p, cRefs=%RU32\n", pProcess, cRefs - 1));
+            pProcess->Release();
+#endif
+            /* Make sure to consume the pointer before the one of the
              * iterator gets released. */
-            ComObjPtr<GuestProcess> pCurProcess = pProcess;
-
-            hr = pCurProcess->COMGETTER(PID)(&uPID);
+            ComObjPtr<GuestProcess> pProc = pProcess;
+
+            hr = pProc->COMGETTER(PID)(&uPID);
             ComAssertComRC(hr);
 
+            Assert(mData.mProcesses.size());
             Assert(mData.mNumObjects);
-            LogFlowFunc(("Removing process ID=%RU32 (Session: %RU32), guest PID=%RU32 (now total %ld processes, %ld objects)\n",
+            LogFlowFunc(("Removing process ID=%RU32 (Session: %RU32), guest PID=%RU32 (now total %zu processes, %RU32 objects)\n",
                          pProcess->getObjectID(), mData.mSession.mID, uPID, mData.mProcesses.size() - 1, mData.mNumObjects - 1));
 
-            pProcess->cancelWaitEvents();
-            pProcess->Release();
-
+            rc = pProcess->onRemove();
             mData.mProcesses.erase(itProcs);
             mData.mNumObjects--;
@@ -1782 +1842 @@
             alock.release(); /* Release lock before firing off event. */
 
-            fireGuestProcessRegisteredEvent(mEventSource, this /* Session */, pCurProcess,
+            fireGuestProcessRegisteredEvent(mEventSource, this /* Session */, pProc,
                                             uPID, false /* Process unregistered */);
-            rc = VINF_SUCCESS;
+            pProc.setNull();
             break;
         }
@@ -1900 +1960 @@
         Assert(mData.mNumObjects <= VBOX_GUESTCTRL_MAX_OBJECTS);
 
-        LogFlowFunc(("Added new process (Session: %RU32) with process ID=%RU32 (now total %ld processes, %ld objects)\n",
+        LogFlowFunc(("Added new process (Session: %RU32) with process ID=%RU32 (now total %zu processes, %ld objects)\n",
                      mData.mSession.mID, uNewProcessID, mData.mProcesses.size(), mData.mNumObjects));
+
+        alock.release(); /* Release lock before firing off event. */
 
         fireGuestProcessRegisteredEvent(mEventSource, this /* Session */, pProcess,
@@ -1993 +2055 @@
 int GuestSession::setSessionStatus(GuestSessionStatus_T sessionStatus, int sessionRc)
 {
-    LogFlowThisFunc(("oldStatus=%ld, newStatus=%ld, sessionRc=%Rrc\n",
+    LogFlowThisFunc(("oldStatus=%RU32, newStatus=%RU32, sessionRc=%Rrc\n",
                      mData.mStatus, sessionStatus, sessionRc));
 
@@ -2178 +2240 @@
 
             default:
-                AssertMsgFailed(("Unhandled session status %ld\n", mData.mStatus));
+                AssertMsgFailed(("Unhandled session status %RU32\n", mData.mStatus));
                 return VERR_NOT_IMPLEMENTED;
         }
@@ -2208 +2270 @@
 
             default:
-                AssertMsgFailed(("Unhandled session status %ld\n", mData.mStatus));
+                AssertMsgFailed(("Unhandled session status %RU32\n", mData.mStatus));
                 return VERR_NOT_IMPLEMENTED;
         }
     }
 
-    LogFlowThisFunc(("sessionStatus=%ld, sessionRc=%Rrc, waitResult=%ld\n",
+    LogFlowThisFunc(("sessionStatus=%RU32, sessionRc=%Rrc, waitResult=%RU32\n",
                      mData.mStatus, mData.mRC, waitResult));
 
@@ -2318 +2380 @@
             *pGuestRc = (int)lGuestRc;
 
-        LogFlowThisFunc(("Status changed event for session ID=%RU32, new status is: %ld (%Rrc)\n",
+        LogFlowThisFunc(("Status changed event for session ID=%RU32, new status is: %RU32 (%Rrc)\n",
                          mData.mSession.mID, sessionStatus,
                          RT_SUCCESS((int)lGuestRc) ? VINF_SUCCESS : (int)lGuestRc));
@@ -2520 +2582 @@
         {
             case VERR_GSTCTL_GUEST_ERROR:
-                hr = GuestProcess::setErrorExternal(this, guestRc);
+                /** @todo Handle VERR_NOT_EQUAL (meaning process exit code <> 0). */
+                hr = setError(VBOX_E_IPRT_ERROR, tr("Directory creation failed: Could not create directory"));
                 break;
 
@@ -2529 +2592 @@
             case VERR_BROKEN_PIPE:
                hr = setError(VBOX_E_IPRT_ERROR, tr("Directory creation failed: Unexpectedly aborted"));
-               break;
-
-            case VERR_CANT_CREATE:
-               hr = setError(VBOX_E_IPRT_ERROR, tr("Directory creation failed: Could not create directory"));
                break;