Changeset 71406 in vbox

Timestamp:

Mar 20, 2018 2:44:24 PM (7 years ago)

Author:

vboxsync

Message:

Guest Control: Revamped internal object [un]registration and organization to provide faster lookups and avoid code duplication. No protocol changes.

Location:

trunk/src/VBox/Main

Files:

• include/GuestCtrlImplPrivate.h (modified) (6 diffs)
• include/GuestDirectoryImpl.h (modified) (2 diffs)
• include/GuestFileImpl.h (modified) (1 diff)
• include/GuestImpl.h (modified) (2 diffs)
• include/GuestProcessImpl.h (modified) (2 diffs)
• include/GuestSessionImpl.h (modified) (7 diffs)
• src-client/GuestCtrlImpl.cpp (modified) (5 diffs)
• src-client/GuestCtrlPrivate.cpp (modified) (6 diffs)
• src-client/GuestDirectoryImpl.cpp (modified) (3 diffs)
• src-client/GuestFileImpl.cpp (modified) (13 diffs)
• src-client/GuestProcessImpl.cpp (modified) (8 diffs)
• src-client/GuestSessionImpl.cpp (modified) (36 diffs)

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

@@ -686 +686 @@
     /** The session's friendly name. Optional. */
     Utf8Str                     mName;
-    /** The session's unique ID. Used to encode
-     *  a context ID. */
+    /** The session's unique ID. Used to encode a context ID. */
     uint32_t                    mID;
     /** Flag indicating if this is an internal session
@@ -907 +906 @@
     GuestWaitEventPayload(uint32_t uTypePayload,
                           const void *pvPayload, uint32_t cbPayload)
-    {
+        : uType(0),
+          cbData(0),
+          pvData(NULL)
+    {
+        int rc = copyFrom(uTypePayload, pvPayload, cbPayload);
+        if (RT_FAILURE(rc))
+            throw rc;
+    }
+
+    virtual ~GuestWaitEventPayload(void)
+    {
+        Clear();
+    }
+
+    GuestWaitEventPayload& operator=(const GuestWaitEventPayload &that)
+    {
+        CopyFromDeep(that);
+        return *this;
+    }
+
+public:
+
+    void Clear(void)
+    {
+        if (pvData)
+        {
+            Assert(cbData);
+            RTMemFree(pvData);
+            cbData = 0;
+            pvData = NULL;
+        }
+        uType = 0;
+    }
+
+    int CopyFromDeep(const GuestWaitEventPayload &payload)
+    {
+        return copyFrom(payload.uType, payload.pvData, payload.cbData);
+    }
+
+    const void* Raw(void) const { return pvData; }
+
+    size_t Size(void) const { return cbData; }
+
+    uint32_t Type(void) const { return uType; }
+
+    void* MutableRaw(void) { return pvData; }
+
+    Utf8Str ToString(void)
+    {
+        const char  *pszStr = (const char *)pvData;
+              size_t cbStr  = cbData;
+
+        if (RT_FAILURE(RTStrValidateEncodingEx(pszStr, cbStr,
+                                               RTSTR_VALIDATE_ENCODING_ZERO_TERMINATED | RTSTR_VALIDATE_ENCODING_EXACT_LENGTH)))
+        {
+            AssertFailed();
+            return "";
+        }
+
+        return Utf8Str(pszStr, cbStr);
+    }
+
+protected:
+
+    int copyFrom(uint32_t uTypePayload, const void *pvPayload, uint32_t cbPayload)
+    {
+        if (cbPayload > _64K) /* Paranoia. */
+            return VERR_TOO_MUCH_DATA;
+
+        Clear();
+
+        int rc = VINF_SUCCESS;
+
         if (cbPayload)
         {
@@ -918 +989 @@
                 cbData = cbPayload;
             }
-            else /* Throw IPRT error. */
-                throw VERR_NO_MEMORY;
+            else
+                rc = VERR_NO_MEMORY;
         }
         else
@@ -928 +999 @@
             cbData = 0;
         }
-    }
-
-    virtual ~GuestWaitEventPayload(void)
-    {
-        Clear();
-    }
-
-    GuestWaitEventPayload& operator=(const GuestWaitEventPayload &that)
-    {
-        CopyFromDeep(that);
-        return *this;
-    }
-
-public:
-
-    void Clear(void)
-    {
-        if (pvData)
-        {
-            RTMemFree(pvData);
-            cbData = 0;
-            pvData = NULL;
-        }
-        uType = 0;
-    }
-
-    int CopyFromDeep(const GuestWaitEventPayload &payload)
-    {
-        Clear();
-
-        int rc = VINF_SUCCESS;
-        if (payload.cbData)
-        {
-            Assert(payload.cbData);
-            pvData = RTMemAlloc(payload.cbData);
-            if (pvData)
-            {
-                memcpy(pvData, payload.pvData, payload.cbData);
-                cbData = payload.cbData;
-                uType = payload.uType;
-            }
-            else
-                rc = VERR_NO_MEMORY;
-        }
 
         return rc;
-    }
-
-    const void* Raw(void) const { return pvData; }
-
-    size_t Size(void) const { return cbData; }
-
-    uint32_t Type(void) const { return uType; }
-
-    void* MutableRaw(void) { return pvData; }
-
-    Utf8Str ToString(void)
-    {
-        const char  *pszStr = (const char *)pvData;
-              size_t cbStr  = cbData;
-
-        if (!RTStrValidateEncodingEx(pszStr, cbStr,
-                                     RTSTR_VALIDATE_ENCODING_ZERO_TERMINATED | RTSTR_VALIDATE_ENCODING_EXACT_LENGTH))
-            return "";
-
-        return Utf8Str(pszStr, cbStr);
     }
 
@@ -1003 +1010 @@
     uint32_t cbData;
     /** Pointer to actual payload data. */
-    void *pvData;
+    void    *pvData;
 };
 
@@ -1114 +1121 @@
     int generateContextID(uint32_t uSessionID, uint32_t uObjectID, uint32_t *puContextID);
     int registerWaitEvent(uint32_t uSessionID, uint32_t uObjectID, GuestWaitEvent **ppEvent);
-    int registerWaitEvent(uint32_t uSessionID, uint32_t uObjectID, const GuestEventTypes &lstEvents, GuestWaitEvent **ppEvent);
+    int registerWaitEventEx(uint32_t uSessionID, uint32_t uObjectID, const GuestEventTypes &lstEvents, GuestWaitEvent **ppEvent);
     int unregisterWaitEvent(GuestWaitEvent *pEvent);
     int waitForEvent(GuestWaitEvent *pEvent, uint32_t uTimeoutMS, VBoxEventType_T *pType, IEvent **ppEvent);

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

@@ -37 +37 @@
     DECLARE_EMPTY_CTOR_DTOR(GuestDirectory)
 
-    int     init(Console *pConsole, GuestSession *pSession, ULONG uDirID, const GuestDirectoryOpenInfo &openInfo);
+    int     init(Console *pConsole, GuestSession *pSession, ULONG aObjectID, const GuestDirectoryOpenInfo &openInfo);
     void    uninit(void);
 
@@ -79 +79 @@
         /** The directory's open info. */
         GuestDirectoryOpenInfo     mOpenInfo;
-        /** The directory's ID. */
-        uint32_t                   mID;
         /** The process tool instance to use. */
         GuestProcessTool           mProcessTool;

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

@@ -123 +123 @@
         /** The file's initial size on open. */
         uint64_t                mInitialSize;
-        /** The file's ID. */
-        uint32_t                mID;
         /** The current file status. */
         FileStatus_T            mStatus;

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2017 Oracle Corporation
+ * Copyright (C) 2006-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -202 +202 @@
 #ifdef VBOX_WITH_GUEST_CONTROL
         GuestSessions               mGuestSessions;
-        uint32_t                    mNextSessionID;
 #endif
     } mData;

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

@@ -40 +40 @@
     DECLARE_EMPTY_CTOR_DTOR(GuestProcess)
 
-    int     init(Console *aConsole, GuestSession *aSession, ULONG aProcessID,
+    int     init(Console *aConsole, GuestSession *aSession, ULONG aObjectID,
                  const GuestProcessStartupInfo &aProcInfo, const GuestEnvironment *pBaseEnv);
     void    uninit(void);
@@ -147 +147 @@
         /** Exit code if process has been terminated. */
         LONG                     mExitCode;
-        /** PID reported from the guest. */
+        /** PID reported from the guest.
+         *  Note: This is *not* the internal object ID! */
         ULONG                    mPID;
         /** The current process status. */

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

@@ -30 +30 @@
 
 #include <iprt/isofs.h> /* For UpdateAdditions. */
+
+#include <deque>
 
 class Guest;
@@ -493 +495 @@
     typedef std::map <uint32_t, ComObjPtr<GuestProcess> > SessionProcesses;
 
+    /** Guest session object type enumeration. */
+    enum SESSIONOBJECTTYPE
+    {
+        /** Anonymous object. */
+        SESSIONOBJECTTYPE_ANONYMOUS  = 0,
+        /** Session object. */
+        SESSIONOBJECTTYPE_SESSION    = 1,
+        /** Directory object. */
+        SESSIONOBJECTTYPE_DIRECTORY  = 2,
+        /** File object. */
+        SESSIONOBJECTTYPE_FILE       = 3,
+        /** Process object. */
+        SESSIONOBJECTTYPE_PROCESS    = 4,
+        /** The usual 32-bit hack. */
+        SESSIONOBJECTTYPE_32BIT_HACK = 0x7fffffff
+    };
+
+    struct SessionObject
+    {
+        /** Creation timestamp (in ms). */
+        uint64_t          tsCreatedMs;
+        /** The object type. */
+        SESSIONOBJECTTYPE enmType;
+    };
+
+    /** Map containing all objects bound to a guest session.
+     *  The key specifies the (global) context ID. */
+    typedef std::map <uint32_t, SessionObject> SessionObjects;
+    /** Queue containing context IDs which are no longer in use.
+     *  Useful for quickly retrieving a new, unused context ID. */
+    typedef std::deque <uint32_t>              SessionObjectsFree;
+
 public:
     /** @name Public internal methods.
      * @todo r=bird: Most of these are public for no real reason...
      * @{ */
-    int                     i_copyToGuestCreateDir(const com::Utf8Str &aDestination, uint32_t fFlags, int *pGuestRc);
     int                     i_closeSession(uint32_t uFlags, uint32_t uTimeoutMS, int *pGuestRc);
     inline bool             i_directoryExists(uint32_t uDirID, ComObjPtr<GuestDirectory> *pDir);
-    int                     i_directoryRemoveFromList(GuestDirectory *pDirectory);
+    int                     i_directoryUnregister(GuestDirectory *pDirectory);
     int                     i_directoryRemove(const Utf8Str &strPath, uint32_t uFlags, int *pGuestRc);
     int                     i_directoryCreate(const Utf8Str &strPath, uint32_t uMode, uint32_t uFlags, int *pGuestRc);
-    int                     i_objectCreateTemp(const Utf8Str &strTemplate, const Utf8Str &strPath, bool fDirectory,
-                                               Utf8Str &strName, int *pGuestRc);
     int                     i_directoryOpen(const GuestDirectoryOpenInfo &openInfo,
                                             ComObjPtr<GuestDirectory> &pDirectory, int *pGuestRc);
     int                     i_directoryQueryInfo(const Utf8Str &strPath, bool fFollowSymlinks, GuestFsObjData &objData, int *pGuestRc);
-    int                     i_dispatchToDirectory(PVBOXGUESTCTRLHOSTCBCTX pCtxCb, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb);
-    int                     i_dispatchToFile(PVBOXGUESTCTRLHOSTCBCTX pCtxCb, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb);
     int                     i_dispatchToObject(PVBOXGUESTCTRLHOSTCBCTX pCtxCb, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb);
-    int                     i_dispatchToProcess(PVBOXGUESTCTRLHOSTCBCTX pCtxCb, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb);
     int                     i_dispatchToThis(PVBOXGUESTCTRLHOSTCBCTX pCtxCb, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb);
     inline bool             i_fileExists(uint32_t uFileID, ComObjPtr<GuestFile> *pFile);
-    int                     i_fileRemoveFromList(GuestFile *pFile);
+    int                     i_fileUnregister(GuestFile *pFile);
     int                     i_fileRemove(const Utf8Str &strPath, int *pGuestRc);
     int                     i_fileOpen(const GuestFileOpenInfo &openInfo, ComObjPtr<GuestFile> &pFile, int *pGuestRc);
     int                     i_fileQueryInfo(const Utf8Str &strPath, bool fFollowSymlinks, GuestFsObjData &objData, int *pGuestRc);
     int                     i_fileQuerySize(const Utf8Str &strPath, bool fFollowSymlinks, int64_t *pllSize, int *pGuestRc);
+    int                     i_fsCreateTemp(const Utf8Str &strTemplate, const Utf8Str &strPath, bool fDirectory,
+                                           Utf8Str &strName, int *pGuestRc);
     int                     i_fsQueryInfo(const Utf8Str &strPath, bool fFollowSymlinks, GuestFsObjData &objData, int *pGuestRc);
     const GuestCredentials &i_getCredentials(void);
@@ -533 +563 @@
     Guest                  *i_getParent(void) { return mParent; }
     uint32_t                i_getProtocolVersion(void) { return mData.mProtocolVersion; }
+    int                     i_objectRegister(SESSIONOBJECTTYPE enmType, uint32_t *puObjectID);
+    int                     i_objectRegisterEx(SESSIONOBJECTTYPE enmType, uint32_t fFlags, uint32_t *puObjectID);
+    int                     i_objectUnregister(uint32_t uObjectID);
     int                     i_pathRename(const Utf8Str &strSource, const Utf8Str &strDest, uint32_t uFlags, int *pGuestRc);
     int                     i_pathUserDocuments(Utf8Str &strPath, int *prcGuest);
     int                     i_pathUserHome(Utf8Str &strPath, int *prcGuest);
-    int                     i_processRemoveFromList(GuestProcess *pProcess);
+    int                     i_processUnregister(GuestProcess *pProcess);
     int                     i_processCreateEx(GuestProcessStartupInfo &procInfo, ComObjPtr<GuestProcess> &pProgress);
     inline bool             i_processExists(uint32_t uProcessID, ComObjPtr<GuestProcess> *pProcess);
@@ -571 +604 @@
         /** The session's startup info. */
         GuestSessionStartupInfo     mSession;
+        /** The session's object ID.
+         *  Needed for registering wait events which are bound directly to this session. */
+        uint32_t                    mObjectID;
         /** The session's current status. */
         GuestSessionStatus_T        mStatus;
@@ -586 +622 @@
         /** Process objects bound to this session. */
         SessionProcesses            mProcesses;
+        /** Map of registered session objects (files, directories, ...). */
+        SessionObjects              mObjects;
+        /** Queue of object IDs which are not used anymore (free list).
+         *  Acts as a "free list" for the mObjects map. */
+        SessionObjectsFree          mObjectsFree;
         /** Guest control protocol version to be used.
          *  Guest Additions < VBox 4.3 have version 1,
@@ -592 +633 @@
         /** Session timeout (in ms). */
         uint32_t                    mTimeout;
-        /** Total number of session objects (processes,
-         *  files, ...). */
-        uint32_t                    mNumObjects;
         /** The last returned session status
          *  returned from the guest side. */
@@ -611 +649 @@
             , mFiles(rThat.mFiles)
             , mProcesses(rThat.mProcesses)
+            , mObjects(rThat.mObjects)
+            , mObjectsFree(rThat.mObjectsFree)
             , mProtocolVersion(rThat.mProtocolVersion)
             , mTimeout(rThat.mTimeout)
-            , mNumObjects(rThat.mNumObjects)
             , mRC(rThat.mRC)
         { }

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

@@ -80 +80 @@
      * changes to the object state.
      */
-    LogFlowFunc(("pvExtension=%p, u32Function=%RU32, pvParms=%p, cbParms=%RU32\n",
-                 pvExtension, u32Function, pvData, cbData));
+    Log2Func(("pvExtension=%p, u32Function=%RU32, pvParms=%p, cbParms=%RU32\n",
+              pvExtension, u32Function, pvData, cbData));
+
     ComObjPtr<Guest> pGuest = reinterpret_cast<Guest *>(pvExtension);
     Assert(!pGuest.isNull());
@@ -93 +94 @@
      */
     if (cbData != sizeof(VBOXGUESTCTRLHOSTCALLBACK))
-        return VERR_NOT_SUPPORTED;
-    PVBOXGUESTCTRLHOSTCALLBACK pSvcCb = (PVBOXGUESTCTRLHOSTCALLBACK)pvData;
+    {
+        AssertMsgFailed(("Guest control host callback data has wrong size (expected %zu, got %zu)\n",
+                         sizeof(VBOXGUESTCTRLHOSTCALLBACK), cbData));
+        return VINF_SUCCESS; /* Never return any errors back to the guest here. */
+    }
+
+    const PVBOXGUESTCTRLHOSTCALLBACK pSvcCb = (PVBOXGUESTCTRLHOSTCALLBACK)pvData;
     AssertPtr(pSvcCb);
 
-    if (!pSvcCb->mParms) /* At least context ID must be present. */
-        return VERR_INVALID_PARAMETER;
-
-    uint32_t uContextID;
-    int rc = pSvcCb->mpaParms[0].getUInt32(&uContextID);
-    AssertMsgRCReturn(rc, ("Unable to extract callback context ID, pvData=%p\n", pSvcCb), rc);
-#ifdef DEBUG
-    LogFlowFunc(("CID=%RU32, uSession=%RU32, uObject=%RU32, uCount=%RU32\n",
-                 uContextID,
-                 VBOX_GUESTCTRL_CONTEXTID_GET_SESSION(uContextID),
-                 VBOX_GUESTCTRL_CONTEXTID_GET_OBJECT(uContextID),
-                 VBOX_GUESTCTRL_CONTEXTID_GET_COUNT(uContextID)));
-#endif
-
-    VBOXGUESTCTRLHOSTCBCTX ctxCb = { u32Function, uContextID };
-    rc = pGuest->i_dispatchToSession(&ctxCb, pSvcCb);
-
-    LogFlowFunc(("Returning rc=%Rrc\n", rc));
-    return rc;
+    if (pSvcCb->mParms) /* At least context ID must be present. */
+    {
+        uint32_t uContextID;
+        int rc = pSvcCb->mpaParms[0].getUInt32(&uContextID);
+        AssertMsgRCReturn(rc, ("Unable to extract callback context ID, pvData=%p\n", pSvcCb),
+                          VINF_SUCCESS /* Never return any errors back to the guest here */);
+
+        VBOXGUESTCTRLHOSTCBCTX ctxCb = { u32Function, uContextID };
+        rc = pGuest->i_dispatchToSession(&ctxCb, pSvcCb);
+
+        Log2Func(("CID=%RU32, uSession=%RU32, uObject=%RU32, uCount=%RU32, rc=%Rrc\n",
+                  uContextID,
+                  VBOX_GUESTCTRL_CONTEXTID_GET_SESSION(uContextID),
+                  VBOX_GUESTCTRL_CONTEXTID_GET_OBJECT(uContextID),
+                  VBOX_GUESTCTRL_CONTEXTID_GET_COUNT(uContextID), rc));
+    }
+
+    /* Never return any errors back to the guest here. */
+    return VINF_SUCCESS;
 }
 
@@ -128 +134 @@
     AssertPtrReturn(pSvcCb, VERR_INVALID_POINTER);
 
-    LogFlowFunc(("uFunction=%RU32, uContextID=%RU32, uProtocol=%RU32\n",
-                  pCtxCb->uFunction, pCtxCb->uContextID, pCtxCb->uProtocol));
+    Log2Func(("uFunction=%RU32, uContextID=%RU32, uProtocol=%RU32\n", pCtxCb->uFunction, pCtxCb->uContextID, pCtxCb->uProtocol));
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    uint32_t uSessionID = VBOX_GUESTCTRL_CONTEXTID_GET_SESSION(pCtxCb->uContextID);
-#ifdef DEBUG
-    LogFlowFunc(("uSessionID=%RU32 (%zu total)\n",
-                 uSessionID, mData.mGuestSessions.size()));
-#endif
-    GuestSessions::const_iterator itSession
-        = mData.mGuestSessions.find(uSessionID);
+    const uint32_t uSessionID = VBOX_GUESTCTRL_CONTEXTID_GET_SESSION(pCtxCb->uContextID);
+
+    Log2Func(("uSessionID=%RU32 (%zu total)\n", uSessionID, mData.mGuestSessions.size()));
+
+    GuestSessions::const_iterator itSession = mData.mGuestSessions.find(uSessionID);
 
     int rc;
@@ -188 +191 @@
                     break;
 
+                /* Process stuff. */
                 case GUEST_EXEC_STATUS:
                 case GUEST_EXEC_OUTPUT:
                 case GUEST_EXEC_INPUT_STATUS:
                 case GUEST_EXEC_IO_NOTIFY:
-                    rc = pSession->i_dispatchToProcess(pCtxCb, pSvcCb);
+                    rc = pSession->i_dispatchToObject(pCtxCb, pSvcCb);
                     break;
 
+                /* File stuff. */
                 case GUEST_FILE_NOTIFY:
-                    rc = pSession->i_dispatchToFile(pCtxCb, pSvcCb);
+                    rc = pSession->i_dispatchToObject(pCtxCb, pSvcCb);
                     break;
 
+                /* Session stuff. */
                 case GUEST_SESSION_NOTIFY:
                     rc = pSession->i_dispatchToThis(pCtxCb, pSvcCb);
@@ -204 +210 @@
 
                 default:
-                    /*
-                     * Try processing generic messages which might
-                     * (or might not) supported by certain objects.
-                     * If the message either is not found or supported
-                     * by the approprirate object, try handling it
-                     * in this session object.
-                     */
                     rc = pSession->i_dispatchToObject(pCtxCb, pSvcCb);
-                    if (   rc == VERR_NOT_FOUND
-                        || rc == VERR_NOT_SUPPORTED)
-                    {
-                        alock.acquire();
-
-                        rc = pSession->dispatchGeneric(pCtxCb, pSvcCb);
-                    }
-#ifndef DEBUG_andy
-                    if (rc == VERR_NOT_IMPLEMENTED)
-                        AssertMsgFailed(("Received not handled function %RU32\n", pCtxCb->uFunction));
-#endif
                     break;
             }

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

@@ -681 +681 @@
 }
 
+/**
+ * Handles generic messages not bound to a specific object type.
+ *
+ * @return VBox status code. VERR_NOT_FOUND if no handler has been found or VERR_NOT_SUPPORTED
+ *         if this class does not support the specified callback.
+ * @param  pCtxCb               Host callback context.
+ * @param  pSvcCb               Service callback data.
+ */
 int GuestBase::dispatchGeneric(PVBOXGUESTCTRLHOSTCBCTX pCtxCb, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb)
 {
@@ -692 +700 @@
     try
     {
-        LogFlowFunc(("uFunc=%RU32, cParms=%RU32\n",
-                     pCtxCb->uFunction, pSvcCb->mParms));
+        Log2Func(("uFunc=%RU32, cParms=%RU32\n", pCtxCb->uFunction, pSvcCb->mParms));
 
         switch (pCtxCb->uFunction)
@@ -716 +723 @@
                     GuestWaitEventPayload evPayload(dataCb.uType, dataCb.pvPayload, dataCb.cbPayload);
                     vrc = signalWaitEventInternal(pCtxCb, dataCb.rc, &evPayload);
-                    if (vrc == VERR_NOT_FOUND)
-                        vrc = VINF_SUCCESS;
                 }
                 else
@@ -766 +771 @@
 }
 
-int GuestBase::registerWaitEvent(uint32_t uSessionID, uint32_t uObjectID,
-                                 GuestWaitEvent **ppEvent)
+/**
+ * Registers (creates) a new wait event based on a given session and object ID.
+ *
+ * From those IDs an unique context ID (CID) will be built, which only can be
+ * around once at a time.
+ *
+ * @returns IPRT status code. VERR_ALREADY_EXISTS if an event with the given session
+ *          and object ID already has been registered.
+ *
+ * @param   uSessionID              Session ID to register wait event for.
+ * @param   uObjectID               Object ID to register wait event for.
+ * @param   ppEvent                 Pointer to registered (created) wait event on success.
+ *                                  Must be destroyed with unregisterWaitEvent().
+ */
+int GuestBase::registerWaitEvent(uint32_t uSessionID, uint32_t uObjectID, GuestWaitEvent **ppEvent)
 {
     GuestEventTypes eventTypesEmpty;
-    return registerWaitEvent(uSessionID, uObjectID, eventTypesEmpty, ppEvent);
-}
-
-/**
- * Registers (creates) a new wait event based on a given session and object ID.
+    return registerWaitEventEx(uSessionID, uObjectID, eventTypesEmpty, ppEvent);
+}
+
+/**
+ * Registers (creates) a new wait event based on a given session, object ID
+ * and a list of event types to wait for.
  *
  * From those IDs an unique context ID (CID) will be built, which only can be
@@ -788 +807 @@
  *                                  Must be destroyed with unregisterWaitEvent().
  */
-int GuestBase::registerWaitEvent(uint32_t uSessionID, uint32_t uObjectID,
-                                 const GuestEventTypes &lstEvents,
-                                 GuestWaitEvent **ppEvent)
+int GuestBase::registerWaitEventEx(uint32_t uSessionID, uint32_t uObjectID, const GuestEventTypes &lstEvents,
+                                   GuestWaitEvent **ppEvent)
 {
     AssertPtrReturn(ppEvent, VERR_INVALID_POINTER);
@@ -1107 +1125 @@
 {
     AssertPtr(mSession);
-    return GuestBase::registerWaitEvent(mSession->i_getId(), mObjectID, lstEvents, ppEvent);
+    return GuestBase::registerWaitEventEx(mSession->i_getId(), mObjectID, lstEvents, ppEvent);
 }
 

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

@@ -58 +58 @@
 /////////////////////////////////////////////////////////////////////////////
 
-int GuestDirectory::init(Console *pConsole, GuestSession *pSession,
-                         ULONG uDirID, const GuestDirectoryOpenInfo &openInfo)
-{
-    LogFlowThisFunc(("pConsole=%p, pSession=%p, uDirID=%RU32, strPath=%s, strFilter=%s, uFlags=%x\n",
-                     pConsole, pSession, uDirID, openInfo.mPath.c_str(), openInfo.mFilter.c_str(),
-                     openInfo.mFlags));
+int GuestDirectory::init(Console *pConsole, GuestSession *pSession, ULONG aObjectID, const GuestDirectoryOpenInfo &openInfo)
+{
+    LogFlowThisFunc(("pConsole=%p, pSession=%p, aObjectID=%RU32, strPath=%s, strFilter=%s, uFlags=%x\n",
+                     pConsole, pSession, aObjectID, openInfo.mPath.c_str(), openInfo.mFilter.c_str(), openInfo.mFlags));
 
     AssertPtrReturn(pConsole, VERR_INVALID_POINTER);
@@ -72 +70 @@
     AssertReturn(autoInitSpan.isOk(), E_FAIL);
 
-    int vrc = bindToSession(pConsole, pSession, uDirID /* Object ID */);
+    int vrc = bindToSession(pConsole, pSession, aObjectID);
     if (RT_SUCCESS(vrc))
     {
-        mSession = pSession;
-
-        mData.mID = uDirID;
+        mSession  = pSession;
+        mObjectID = aObjectID;
+
         mData.mOpenInfo = openInfo;
     }
@@ -262 +260 @@
 
     AssertPtr(mSession);
-    int rc2 = mSession->i_directoryRemoveFromList(this);
+    int rc2 = mSession->i_directoryUnregister(this);
     if (RT_SUCCESS(rc))
         rc = rc2;

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

@@ -135 +135 @@
  * @param   pConsole                Pointer to console object.
  * @param   pSession                Pointer to session object.
- * @param   uFileID                 Host-based file ID (part of the context ID).
+ * @param   aObjectID               The object's ID.
  * @param   openInfo                File opening information.
  */
 int GuestFile::init(Console *pConsole, GuestSession *pSession,
-                    ULONG uFileID, const GuestFileOpenInfo &openInfo)
-{
-    LogFlowThisFunc(("pConsole=%p, pSession=%p, uFileID=%RU32, strPath=%s\n",
-                     pConsole, pSession, uFileID, openInfo.mFileName.c_str()));
+                    ULONG aObjectID, const GuestFileOpenInfo &openInfo)
+{
+    LogFlowThisFunc(("pConsole=%p, pSession=%p, aObjectID=%RU32, strPath=%s\n",
+                     pConsole, pSession, aObjectID, openInfo.mFileName.c_str()));
 
     AssertPtrReturn(pConsole, VERR_INVALID_POINTER);
@@ -151 +151 @@
     AssertReturn(autoInitSpan.isOk(), VERR_OBJECT_DESTROYED);
 
-    int vrc = bindToSession(pConsole, pSession, uFileID /* Object ID */);
+    int vrc = bindToSession(pConsole, pSession, aObjectID);
     if (RT_SUCCESS(vrc))
     {
         mSession = pSession;
 
-        mData.mID = uFileID;
         mData.mInitialSize = 0;
         mData.mStatus = FileStatus_Undefined;
@@ -278 +277 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    *aId = mData.mID;
+    *aId = mObjectID;
 
     return S_OK;
@@ -381 +380 @@
     int i = 0;
     paParms[i++].setUInt32(pEvent->ContextID());
-    paParms[i++].setUInt32(mData.mID /* Guest file ID */);
+    paParms[i++].setUInt32(mObjectID /* Guest file ID */);
 
     vrc = sendCommand(HOST_FILE_CLOSE, i, paParms);
@@ -453 +452 @@
         AssertRC(rc2);
 
-        rc2 = signalWaitEventInternal(pCbCtx,
-                                      rcGuest, NULL /* pPayload */);
+        rc2 = signalWaitEventInternal(pCbCtx, rcGuest, NULL /* pPayload */);
         AssertRC(rc2);
 
@@ -476 +474 @@
                 pSvcCbData->mpaParms[idx++].getUInt32(&dataCb.u.open.uHandle);
 
-                AssertMsg(mData.mID == VBOX_GUESTCTRL_CONTEXTID_GET_OBJECT(pCbCtx->uContextID),
-                          ("File ID %RU32 does not match context ID %RU32\n", mData.mID,
+                AssertMsg(mObjectID == VBOX_GUESTCTRL_CONTEXTID_GET_OBJECT(pCbCtx->uContextID),
+                          ("File ID %RU32 does not match object ID %RU32\n", mObjectID,
                            VBOX_GUESTCTRL_CONTEXTID_GET_OBJECT(pCbCtx->uContextID)));
 
@@ -687 +685 @@
     vrc = sendCommand(HOST_FILE_OPEN, i, paParms);
     if (RT_SUCCESS(vrc))
-        vrc = i_waitForStatusChange(pEvent, uTimeoutMS,
-                                    NULL /* FileStatus */, prcGuest);
+        vrc = i_waitForStatusChange(pEvent, uTimeoutMS, NULL /* FileStatus */, prcGuest);
 
     unregisterWaitEvent(pEvent);
@@ -730 +727 @@
     int i = 0;
     paParms[i++].setUInt32(pEvent->ContextID());
-    paParms[i++].setUInt32(mData.mID /* File handle */);
+    paParms[i++].setUInt32(mObjectID /* File handle */);
     paParms[i++].setUInt32(uSize /* Size (in bytes) to read */);
 
@@ -785 +782 @@
     int i = 0;
     paParms[i++].setUInt32(pEvent->ContextID());
-    paParms[i++].setUInt32(mData.mID /* File handle */);
+    paParms[i++].setUInt32(mObjectID /* File handle */);
     paParms[i++].setUInt64(uOffset /* Offset (in bytes) to start reading */);
     paParms[i++].setUInt32(uSize /* Size (in bytes) to read */);
@@ -842 +839 @@
     int i = 0;
     paParms[i++].setUInt32(pEvent->ContextID());
-    paParms[i++].setUInt32(mData.mID /* File handle */);
+    paParms[i++].setUInt32(mObjectID /* File handle */);
     paParms[i++].setUInt32(eSeekType /* Seek method */);
     /** @todo uint64_t vs. int64_t! */
@@ -1091 +1088 @@
     int i = 0;
     paParms[i++].setUInt32(pEvent->ContextID());
-    paParms[i++].setUInt32(mData.mID /* File handle */);
+    paParms[i++].setUInt32(mObjectID /* File handle */);
     paParms[i++].setUInt32(cbData /* Size (in bytes) to write */);
     paParms[i++].setPointer(pvData, cbData);
@@ -1150 +1147 @@
     int i = 0;
     paParms[i++].setUInt32(pEvent->ContextID());
-    paParms[i++].setUInt32(mData.mID /* File handle */);
+    paParms[i++].setUInt32(mObjectID /* File handle */);
     paParms[i++].setUInt64(uOffset /* Offset where to starting writing */);
     paParms[i++].setUInt32(cbData /* Size (in bytes) to write */);
@@ -1189 +1186 @@
 
     AssertPtr(mSession);
-    int rc2 = mSession->i_fileRemoveFromList(this);
+    int rc2 = mSession->i_fileUnregister(this);
     if (RT_SUCCESS(rc))
         rc = rc2;

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

@@ -178 +178 @@
 /////////////////////////////////////////////////////////////////////////////
 
-int GuestProcess::init(Console *aConsole, GuestSession *aSession, ULONG aProcessID,
+int GuestProcess::init(Console *aConsole, GuestSession *aSession, ULONG aObjectID,
                        const GuestProcessStartupInfo &aProcInfo, const GuestEnvironment *pBaseEnv)
 {
-    LogFlowThisFunc(("aConsole=%p, aSession=%p, aProcessID=%RU32 pBaseEnv=%p\n",
-                     aConsole, aSession, aProcessID, pBaseEnv));
+    LogFlowThisFunc(("aConsole=%p, aSession=%p, aObjectID=%RU32, pBaseEnv=%p\n",
+                     aConsole, aSession, aObjectID, pBaseEnv));
 
     AssertPtrReturn(aConsole, VERR_INVALID_POINTER);
@@ -193 +193 @@
     HRESULT hr;
 
-    int vrc = bindToSession(aConsole, aSession, aProcessID /* Object ID */);
+    int vrc = bindToSession(aConsole, aSession, aObjectID);
     if (RT_SUCCESS(vrc))
     {
@@ -293 +293 @@
     }
 
+    AssertPtr(mSession);
+    mSession->i_processUnregister(this);
+
     baseUninit();
 
-    LogFlowThisFunc(("Returning rc=%Rrc, rcGuest=%Rrc\n",
-                     vrc, rcGuest));
+    LogFlowThisFunc(("Returning rc=%Rrc, rcGuest=%Rrc\n", vrc, rcGuest));
     RT_NOREF_PV(vrc);
 }
@@ -337 +339 @@
     }
     else
-        hrc = setError(VBOX_E_NOT_SUPPORTED, tr("The base environment feature is not supported by the guest additions"));
+        hrc = setError(VBOX_E_NOT_SUPPORTED, tr("The base environment feature is not supported by installed Guest Additions"));
     LogFlowThisFuncLeave();
     return hrc;
@@ -1804 +1806 @@
 
     int rcGuest;
-    int vrc = i_terminateProcess(30 * 1000 /* Timeout in ms */,
-                                 &rcGuest);
+    int vrc = i_terminateProcess(30 * 1000 /* Timeout in ms */, &rcGuest);
     if (RT_FAILURE(vrc))
     {
@@ -1831 +1832 @@
      * still can hold references to it. */
     AssertPtr(mSession);
-    int rc2 = mSession->i_processRemoveFromList(this);
+    int rc2 = mSession->i_processUnregister(this);
     if (RT_SUCCESS(vrc))
         vrc = rc2;
@@ -1952 +1953 @@
 GuestProcessTool::~GuestProcessTool(void)
 {
-    terminate(30 * 1000, NULL /* prcGuest */);
+     if (!pProcess.isNull())
+     {
+         /* Terminate (and unregister) process. */
+         pProcess->uninit();
+
+         /* Release reference. */
+         pProcess.setNull();
+     }
 }
 
@@ -2439 +2447 @@
     LogFlowThisFuncEnter();
 
-    int rc = VINF_SUCCESS;
+    int rc;
     if (!pProcess.isNull())
-    {
         rc = pProcess->i_terminateProcess(uTimeoutMS, prcGuest);
-        pProcess.setNull();
-    }
     else
         rc = VERR_NOT_FOUND;

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

@@ -208 +208 @@
     mData.mSession.mOpenTimeoutMS = ssInfo.mOpenTimeoutMS;
 
+    /* Copy over session credentials. */
     /** @todo Use an overloaded copy operator. Later. */
     mData.mCredentials.mUser = guestCreds.mUser;
@@ -216 +217 @@
     mData.mRC = VINF_SUCCESS;
     mData.mStatus = GuestSessionStatus_Undefined;
-    mData.mNumObjects = 0;
     mData.mpBaseEnvironment = NULL;
-    int rc = mData.mEnvironmentChanges.initChangeRecord();
+
+    /*
+     * Register an object for the session itself to clearly
+     * distinguish callbacks which are for this session directly, or for
+     * objects (like files, directories, ...) which are bound to this session.
+     */
+    int rc = i_objectRegister(SESSIONOBJECTTYPE_SESSION, &mData.mObjectID);
     if (RT_SUCCESS(rc))
     {
-        rc = RTCritSectInit(&mWaitEventCritSect);
-        AssertRC(rc);
-    }
+        rc = mData.mEnvironmentChanges.initChangeRecord();
+        if (RT_SUCCESS(rc))
+        {
+            rc = RTCritSectInit(&mWaitEventCritSect);
+            AssertRC(rc);
+        }
+    }
+
     if (RT_SUCCESS(rc))
         rc = i_determineProtocolVersion();
+
     if (RT_SUCCESS(rc))
     {
@@ -298 +310 @@
          itDirs != mData.mDirectories.end(); ++itDirs)
     {
-        Assert(mData.mNumObjects);
-        mData.mNumObjects--;
         itDirs->second->i_onRemove();
         itDirs->second->uninit();
@@ -310 +320 @@
          itFiles != mData.mFiles.end(); ++itFiles)
     {
-        Assert(mData.mNumObjects);
-        mData.mNumObjects--;
         itFiles->second->i_onRemove();
         itFiles->second->uninit();
@@ -322 +330 @@
          itProcs != mData.mProcesses.end(); ++itProcs)
     {
-        Assert(mData.mNumObjects);
-        mData.mNumObjects--;
         itProcs->second->i_onRemove();
         itProcs->second->uninit();
@@ -329 +335 @@
     mData.mProcesses.clear();
 
+    /* Unregister the session's object ID. */
+    i_objectUnregister(mData.mObjectID);
+
+    mData.mObjects.clear();
+    mData.mObjectsFree.clear();
+
     mData.mEnvironmentChanges.reset();
 
@@ -336 +348 @@
         mData.mpBaseEnvironment = NULL;
     }
-
-    AssertMsg(mData.mNumObjects == 0,
-              ("mNumObjects=%RU32 when it should be 0\n", mData.mNumObjects));
 
     /* Unitialize our local listener. */
@@ -698 +707 @@
         eventTypes.push_back(VBoxEventType_OnGuestSessionStateChanged);
 
-        vrc = registerWaitEvent(mData.mSession.mID, 0 /* Object ID */,
-                                eventTypes, &pEvent);
+        vrc = registerWaitEventEx(mData.mSession.mID, mData.mObjectID, eventTypes, &pEvent);
     }
     catch (std::bad_alloc)
@@ -815 +823 @@
 }
 
-int GuestSession::i_directoryRemoveFromList(GuestDirectory *pDirectory)
+/**
+ * Unregisters a directory object from a session.
+ *
+ * @return VBox status code. VERR_NOT_FOUND if the directory is not registered (anymore).
+ * @param  pDirectory           Directory object to unregister from session.
+ */
+int GuestSession::i_directoryUnregister(GuestDirectory *pDirectory)
 {
     AssertPtrReturn(pDirectory, VERR_INVALID_POINTER);
 
+    LogFlowThisFunc(("pDirectory=%p\n", pDirectory));
+
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    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());
-            ComAssertComRC(hr);
-
-            Assert(mData.mDirectories.size());
-            Assert(mData.mNumObjects);
-            LogFlowFunc(("Removing directory \"%s\" (Session: %RU32) (now total %zu processes, %RU32 objects)\n",
-                         Utf8Str(strName).c_str(), mData.mSession.mID, mData.mDirectories.size() - 1, mData.mNumObjects - 1));
-
-            rc = pDirectory->i_onRemove();
-            mData.mDirectories.erase(itDirs);
-            mData.mNumObjects--;
-
-            pDir.setNull();
-            break;
-        }
-
-        ++itDirs;
-    }
+    const uint32_t uObjectID = pDirectory->getObjectID();
+
+    LogFlowFunc(("Removing directory (objectID=%RU32) ...\n", uObjectID));
+
+    int rc = i_objectUnregister(uObjectID);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    SessionDirectories::iterator itDirs = mData.mDirectories.find(uObjectID);
+    AssertReturn(itDirs != mData.mDirectories.end(), VERR_NOT_FOUND);
+
+    /* Make sure to consume the pointer before the one of the iterator gets released. */
+    ComObjPtr<GuestDirectory> pDirConsumed = pDirectory;
+
+    LogFlowFunc(("Removing directory ID=%RU32 (session %RU32, now total %zu directories)\n",
+                 uObjectID, mData.mSession.mID, mData.mDirectories.size()));
+
+    rc = pDirConsumed->i_onRemove();
+    AssertRCReturn(rc, rc);
+
+    mData.mDirectories.erase(itDirs);
+
+    alock.release(); /* Release lock before firing off event. */
+
+//    fireGuestDirectoryRegisteredEvent(mEventSource, this /* Session */, pDirConsumed, false /* Process unregistered */);
+
+    pDirConsumed.setNull();
 
     LogFlowFuncLeaveRC(rc);
@@ -866 +879 @@
 
     GuestWaitEvent *pEvent = NULL;
-    int vrc = registerWaitEvent(mData.mSession.mID, 0 /* Object ID */,
-                                &pEvent);
+    int vrc = registerWaitEvent(mData.mSession.mID, mData.mObjectID, &pEvent);
     if (RT_FAILURE(vrc))
         return vrc;
@@ -896 +908 @@
 }
 
-int GuestSession::i_objectCreateTemp(const Utf8Str &strTemplate, const Utf8Str &strPath,
-                                     bool fDirectory, Utf8Str &strName, int *prcGuest)
+int GuestSession::i_fsCreateTemp(const Utf8Str &strTemplate, const Utf8Str &strPath, bool fDirectory, Utf8Str &strName,
+                                 int *prcGuest)
 {
     AssertPtrReturn(prcGuest, VERR_INVALID_POINTER);
@@ -931 +943 @@
     int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
     GuestCtrlStreamObjects stdOut;
-    int vrc = GuestProcessTool::runEx(this, procInfo,
-                                        &stdOut, 1 /* cStrmOutObjects */,
-                                        &vrcGuest);
+    int vrc = GuestProcessTool::runEx(this, procInfo, &stdOut, 1 /* cStrmOutObjects */, &vrcGuest);
     if (!GuestProcess::i_isGuestError(vrc))
     {
@@ -971 +981 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    int rc = VERR_GSTCTL_MAX_OBJECTS_REACHED;
-    if (mData.mNumObjects >= VBOX_GUESTCTRL_MAX_OBJECTS)
-        return rc;
-
-    /* Create a new (host-based) directory ID and assign it. */
-    uint32_t uNewDirID = 0;
-    ULONG uTries = 0;
-
-    for (;;)
-    {
-        /* Is the directory ID already used? */
-        if (!i_directoryExists(uNewDirID, NULL /* pDirectory */))
-        {
-            /* Callback with context ID was not found. This means
-             * we can use this context ID for our new callback we want
-             * to add below. */
-            rc = VINF_SUCCESS;
-            break;
-        }
-        uNewDirID++;
-        if (uNewDirID == VBOX_GUESTCTRL_MAX_OBJECTS)
-            uNewDirID = 0;
-
-        if (++uTries == UINT32_MAX)
-            break; /* Don't try too hard. */
-    }
-
+    /* Register a new object ID. */
+    uint32_t uObjectID;
+    int rc = i_objectRegister(SESSIONOBJECTTYPE_DIRECTORY, &uObjectID);
     if (RT_FAILURE(rc))
         return rc;
@@ -1009 +995 @@
     AssertPtr(pConsole);
 
-    int vrc = pDirectory->init(pConsole, this /* Parent */,
-                               uNewDirID, openInfo);
+    int vrc = pDirectory->init(pConsole, this /* Parent */, uObjectID, openInfo);
     if (RT_FAILURE(vrc))
         return vrc;
@@ -1024 +1009 @@
     {
         /* Add the created directory to our map. */
-        mData.mDirectories[uNewDirID] = pDirectory;
-        mData.mNumObjects++;
-        Assert(mData.mNumObjects <= VBOX_GUESTCTRL_MAX_OBJECTS);
-
-        LogFlowFunc(("Added new guest directory \"%s\" (Session: %RU32) (now total %zu dirs, %RU32 objects)\n",
-                     openInfo.mPath.c_str(), mData.mSession.mID, mData.mFiles.size(), mData.mNumObjects));
+        mData.mDirectories[uObjectID] = pDirectory;
+
+        LogFlowFunc(("Added new guest directory \"%s\" (Session: %RU32) (now total %zu directories)\n",
+                     openInfo.mPath.c_str(), mData.mSession.mID, mData.mDirectories.size()));
 
         alock.release(); /* Release lock before firing off event. */
@@ -1051 +1034 @@
 }
 
-int GuestSession::i_dispatchToDirectory(PVBOXGUESTCTRLHOSTCBCTX pCtxCb, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb)
+/**
+ * Dispatches a host callback to its corresponding object.
+ *
+ * @return VBox status code. VERR_NOT_FOUND if no corresponding object was found.
+ * @param  pCtxCb               Host callback context.
+ * @param  pSvcCb               Service callback data.
+ */
+int GuestSession::i_dispatchToObject(PVBOXGUESTCTRLHOSTCBCTX pCtxCb, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb)
 {
     LogFlowFunc(("pCtxCb=%p, pSvcCb=%p\n", pCtxCb, pSvcCb));
@@ -1058 +1048 @@
     AssertPtrReturn(pSvcCb, VERR_INVALID_POINTER);
 
-    if (pSvcCb->mParms < 3)
-        return VERR_INVALID_PARAMETER;
-
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    uint32_t uDirID = VBOX_GUESTCTRL_CONTEXTID_GET_OBJECT(pCtxCb->uContextID);
-#ifdef DEBUG
-    LogFlowFunc(("uDirID=%RU32 (%zu total)\n",
-                 uDirID, mData.mFiles.size()));
-#endif
-    int rc;
-    SessionDirectories::const_iterator itDir
-        = mData.mDirectories.find(uDirID);
-    if (itDir != mData.mDirectories.end())
-    {
-        ComObjPtr<GuestDirectory> pDirectory(itDir->second);
-        Assert(!pDirectory.isNull());
-
-        alock.release();
-
-        rc = pDirectory->i_callbackDispatcher(pCtxCb, pSvcCb);
-    }
-    else
-        rc = VERR_NOT_FOUND;
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
-}
-
-int GuestSession::i_dispatchToFile(PVBOXGUESTCTRLHOSTCBCTX pCtxCb, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb)
-{
-    LogFlowFunc(("pCtxCb=%p, pSvcCb=%p\n", pCtxCb, pSvcCb));
-
-    AssertPtrReturn(pCtxCb, VERR_INVALID_POINTER);
-    AssertPtrReturn(pSvcCb, VERR_INVALID_POINTER);
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    uint32_t uFileID = VBOX_GUESTCTRL_CONTEXTID_GET_OBJECT(pCtxCb->uContextID);
-#ifdef DEBUG
-    LogFlowFunc(("uFileID=%RU32 (%zu total)\n",
-                 uFileID, mData.mFiles.size()));
-#endif
-    int rc;
-    SessionFiles::const_iterator itFile
-        = mData.mFiles.find(uFileID);
-    if (itFile != mData.mFiles.end())
-    {
-        ComObjPtr<GuestFile> pFile(itFile->second);
-        Assert(!pFile.isNull());
-
-        alock.release();
-
-        rc = pFile->i_callbackDispatcher(pCtxCb, pSvcCb);
-    }
-    else
-        rc = VERR_NOT_FOUND;
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
-}
-
-int GuestSession::i_dispatchToObject(PVBOXGUESTCTRLHOSTCBCTX pCtxCb, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb)
-{
-    LogFlowFunc(("pCtxCb=%p, pSvcCb=%p\n", pCtxCb, pSvcCb));
-
-    AssertPtrReturn(pCtxCb, VERR_INVALID_POINTER);
-    AssertPtrReturn(pSvcCb, VERR_INVALID_POINTER);
-
-    int rc;
-    uint32_t uObjectID = VBOX_GUESTCTRL_CONTEXTID_GET_OBJECT(pCtxCb->uContextID);
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    /* Since we don't know which type the object is, we need to through all
-     * all objects. */
-    /** @todo Speed this up by adding an object type to the callback context! */
-    SessionProcesses::const_iterator itProc = mData.mProcesses.find(uObjectID);
-    if (itProc == mData.mProcesses.end())
-    {
-        SessionFiles::const_iterator itFile = mData.mFiles.find(uObjectID);
-        if (itFile != mData.mFiles.end())
+    const uint32_t uObjectID = VBOX_GUESTCTRL_CONTEXTID_GET_OBJECT(pCtxCb->uContextID);
+
+    int rc = VERR_NOT_FOUND;
+
+    SessionObjects::const_iterator itObjs = mData.mObjects.find(uObjectID);
+
+    if (itObjs == mData.mObjects.end())
+        return rc;
+
+    /* Set protocol version so that pSvcCb can be interpreted right. */
+    pCtxCb->uProtocol = mData.mProtocolVersion;
+
+    switch (itObjs->second.enmType)
+    {
+        case SESSIONOBJECTTYPE_ANONYMOUS:
+            rc = VERR_NOT_SUPPORTED;
+            break;
+
+        case SESSIONOBJECTTYPE_SESSION:
         {
             alock.release();
 
-            rc = i_dispatchToFile(pCtxCb, pSvcCb);
-        }
-        else
+            rc = i_dispatchToThis(pCtxCb, pSvcCb);
+            break;
+        }
+        case SESSIONOBJECTTYPE_DIRECTORY:
         {
             SessionDirectories::const_iterator itDir = mData.mDirectories.find(uObjectID);
             if (itDir != mData.mDirectories.end())
             {
+                ComObjPtr<GuestDirectory> pDirectory(itDir->second);
+                Assert(!pDirectory.isNull());
+
                 alock.release();
 
-                rc = i_dispatchToDirectory(pCtxCb, pSvcCb);
+                rc = pDirectory->i_callbackDispatcher(pCtxCb, pSvcCb);
             }
-            else
-                rc = VERR_NOT_FOUND;
-        }
-    }
-    else
-    {
-        alock.release();
-
-        rc = i_dispatchToProcess(pCtxCb, pSvcCb);
+            break;
+        }
+        case SESSIONOBJECTTYPE_FILE:
+        {
+            SessionFiles::const_iterator itFile = mData.mFiles.find(uObjectID);
+            if (itFile != mData.mFiles.end())
+            {
+                ComObjPtr<GuestFile> pFile(itFile->second);
+                Assert(!pFile.isNull());
+
+                alock.release();
+
+                rc = pFile->i_callbackDispatcher(pCtxCb, pSvcCb);
+            }
+            break;
+        }
+        case SESSIONOBJECTTYPE_PROCESS:
+        {
+            SessionProcesses::const_iterator itProc = mData.mProcesses.find(uObjectID);
+            if (itProc != mData.mProcesses.end())
+            {
+                ComObjPtr<GuestProcess> pProcess(itProc->second);
+                Assert(!pProcess.isNull());
+
+                alock.release();
+
+                rc = pProcess->i_callbackDispatcher(pCtxCb, pSvcCb);
+            }
+            break;
+        }
+        default:
+            AssertFailed();
+            break;
     }
 
@@ -1169 +1126 @@
 }
 
-int GuestSession::i_dispatchToProcess(PVBOXGUESTCTRLHOSTCBCTX pCtxCb, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb)
-{
-    LogFlowFunc(("pCtxCb=%p, pSvcCb=%p\n", pCtxCb, pSvcCb));
-
-    AssertPtrReturn(pCtxCb, VERR_INVALID_POINTER);
-    AssertPtrReturn(pSvcCb, VERR_INVALID_POINTER);
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    uint32_t uProcessID = VBOX_GUESTCTRL_CONTEXTID_GET_OBJECT(pCtxCb->uContextID);
-#ifdef DEBUG
-    LogFlowFunc(("uProcessID=%RU32 (%zu total)\n",
-                 uProcessID, mData.mProcesses.size()));
-#endif
-    int rc;
-    SessionProcesses::const_iterator itProc
-        = mData.mProcesses.find(uProcessID);
-    if (itProc != mData.mProcesses.end())
-    {
-#ifdef DEBUG_andy
-        ULONG cRefs = itProc->second->AddRef();
-        Assert(cRefs >= 2);
-        LogFlowFunc(("pProcess=%p, cRefs=%RU32\n", &itProc->second, cRefs - 1));
-        itProc->second->Release();
-#endif
-        ComObjPtr<GuestProcess> pProcess(itProc->second);
-        Assert(!pProcess.isNull());
-
-        /* Set protocol version so that pSvcCb can
-         * be interpreted right. */
-        pCtxCb->uProtocol = mData.mProtocolVersion;
-
-        alock.release();
-        rc = pProcess->i_callbackDispatcher(pCtxCb, pSvcCb);
-    }
-    else
-        rc = VERR_NOT_FOUND;
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
-}
-
 int GuestSession::i_dispatchToThis(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb)
 {
@@ -1218 +1133 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-#ifdef DEBUG
     LogFlowThisFunc(("sessionID=%RU32, CID=%RU32, uFunction=%RU32, pSvcCb=%p\n",
                      mData.mSession.mID, pCbCtx->uContextID, pCbCtx->uFunction, pSvcCb));
-#endif
-
     int rc;
     switch (pCbCtx->uFunction)
@@ -1238 +1150 @@
 
         default:
-            /* Silently skip unknown callbacks. */
-            rc = VERR_NOT_SUPPORTED;
+            rc = dispatchGeneric(pCbCtx, pSvcCb);
             break;
     }
@@ -1259 +1170 @@
 }
 
-int GuestSession::i_fileRemoveFromList(GuestFile *pFile)
-{
+/**
+ * Unregisters a file object from a session.
+ *
+ * @return VBox status code. VERR_NOT_FOUND if the file is not registered (anymore).
+ * @param  pFile                File object to unregister from session.
+ */
+int GuestSession::i_fileUnregister(GuestFile *pFile)
+{
+    AssertPtrReturn(pFile, VERR_INVALID_POINTER);
+
+    LogFlowThisFunc(("pFile=%p\n", pFile));
+
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    int rc = VERR_NOT_FOUND;
-
-    SessionFiles::iterator itFiles = mData.mFiles.begin();
-    while (itFiles != mData.mFiles.end())
-    {
-        if (pFile == itFiles->second)
-        {
-            /* Make sure to consume the pointer before the one of thfe
-             * iterator gets released. */
-            ComObjPtr<GuestFile> pCurFile = pFile;
-
-            Bstr strName;
-            HRESULT hr = pCurFile->COMGETTER(FileName)(strName.asOutParam());
-            ComAssertComRC(hr);
-
-            Assert(mData.mNumObjects);
-            LogFlowThisFunc(("Removing guest file \"%s\" (Session: %RU32) (now total %zu files, %RU32 objects)\n",
-                             Utf8Str(strName).c_str(), mData.mSession.mID, mData.mFiles.size() - 1, mData.mNumObjects - 1));
-
-            rc = pFile->i_onRemove();
-            mData.mFiles.erase(itFiles);
-            mData.mNumObjects--;
-
-            alock.release(); /* Release lock before firing off event. */
-
-            fireGuestFileRegisteredEvent(mEventSource, this, pCurFile,
-                                         false /* Unregistered */);
-            pCurFile.setNull();
-            break;
-        }
-
-        ++itFiles;
-    }
+    const uint32_t uObjectID = pFile->getObjectID();
+
+    LogFlowFunc(("Removing file (objectID=%RU32) ...\n", uObjectID));
+
+    int rc = i_objectUnregister(uObjectID);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    SessionFiles::iterator itFiles = mData.mFiles.find(uObjectID);
+    AssertReturn(itFiles != mData.mFiles.end(), VERR_NOT_FOUND);
+
+    /* Make sure to consume the pointer before the one of the iterator gets released. */
+    ComObjPtr<GuestFile> pFileConsumed = pFile;
+
+    LogFlowFunc(("Removing file ID=%RU32 (session %RU32, now total %zu files)\n",
+                 pFileConsumed->getObjectID(), mData.mSession.mID, mData.mFiles.size()));
+
+    rc = pFileConsumed->i_onRemove();
+    AssertRCReturn(rc, rc);
+
+    mData.mFiles.erase(itFiles);
+
+    alock.release(); /* Release lock before firing off event. */
+
+    fireGuestFileRegisteredEvent(mEventSource, this, pFileConsumed, false /* Unregistered */);
+
+    pFileConsumed.setNull();
 
     LogFlowFuncLeaveRC(rc);
@@ -1341 +1256 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    /* Guest Additions < 4.3 don't support handling
-       guest files, skip. */
+    /* Guest Additions < 4.3 don't support handling guest files, skip. */
     if (mData.mProtocolVersion < 2)
     {
-        LogFlowThisFunc(("Installed Guest Additions don't support handling guest files, skipping\n"));
-        return VERR_NOT_SUPPORTED;
-    }
-
-    int rc = VERR_GSTCTL_MAX_OBJECTS_REACHED;
-    if (mData.mNumObjects >= VBOX_GUESTCTRL_MAX_OBJECTS)
-        return rc;
-
-    /* Create a new (host-based) file ID and assign it. */
-    uint32_t uNewFileID = 0;
-    ULONG uTries = 0;
-
-    for (;;)
-    {
-        /* Is the file ID already used? */
-        if (!i_fileExists(uNewFileID, NULL /* pFile */))
-        {
-            /* Callback with context ID was not found. This means
-             * we can use this context ID for our new callback we want
-             * to add below. */
-            rc = VINF_SUCCESS;
-            break;
-        }
-        uNewFileID++;
-        if (uNewFileID == VBOX_GUESTCTRL_MAX_OBJECTS)
-            uNewFileID = 0;
-
-        if (++uTries == UINT32_MAX)
-            break; /* Don't try too hard. */
-    }
-
+        if (prcGuest)
+            *prcGuest = VERR_NOT_SUPPORTED;
+        return VERR_GSTCTL_GUEST_ERROR;
+    }
+
+    /* Register a new object ID. */
+    uint32_t uObjectID;
+    int rc = i_objectRegister(SESSIONOBJECTTYPE_FILE, &uObjectID);
     if (RT_FAILURE(rc))
         return rc;
@@ -1387 +1278 @@
     AssertPtr(pConsole);
 
-    rc = pFile->init(pConsole, this /* GuestSession */,
-                     uNewFileID, openInfo);
+    rc = pFile->init(pConsole, this /* GuestSession */, uObjectID, openInfo);
     if (RT_FAILURE(rc))
         return rc;
@@ -1402 +1292 @@
     {
         /* Add the created file to our vector. */
-        mData.mFiles[uNewFileID] = pFile;
-        mData.mNumObjects++;
-        Assert(mData.mNumObjects <= VBOX_GUESTCTRL_MAX_OBJECTS);
-
-        LogFlowFunc(("Added new guest file \"%s\" (Session: %RU32) (now total %zu files, %RU32 objects)\n",
-                     openInfo.mFileName.c_str(), mData.mSession.mID, mData.mFiles.size(), mData.mNumObjects));
+        mData.mFiles[uObjectID] = pFile;
+
+        LogFlowFunc(("Added new guest file \"%s\" (Session: %RU32) (now total %zu files)\n",
+                     openInfo.mFileName.c_str(), mData.mSession.mID, mData.mFiles.size()));
 
         alock.release(); /* Release lock before firing off event. */
 
-        fireGuestFileRegisteredEvent(mEventSource, this, pFile,
-                                     true /* Registered */);
+        fireGuestFileRegisteredEvent(mEventSource, this, pFile, true /* Registered */);
     }
     catch (std::bad_alloc &)
@@ -1756 +1643 @@
         eventTypes.push_back(VBoxEventType_OnGuestSessionStateChanged);
 
-        vrc = registerWaitEvent(mData.mSession.mID, 0 /* Object ID */,
-                                eventTypes, &pEvent);
+        vrc = registerWaitEventEx(mData.mSession.mID, mData.mObjectID, eventTypes, &pEvent);
     }
     catch (std::bad_alloc)
@@ -1869 +1755 @@
 }
 
+/**
+ * Registers an object to a session.
+ *
+ * @return VBox status code.
+ * @param  enmType              Session object type to register.
+ * @param  puObjectID           Returns registered object ID on success. Optional.
+ */
+int GuestSession::i_objectRegister(SESSIONOBJECTTYPE enmType, uint32_t *puObjectID)
+{
+    return i_objectRegisterEx(enmType, 0 /* fFlags */, puObjectID);
+}
+
+/**
+ * Registers an object to a session, extended version.
+ *
+ * @return VBox status code. VERR_GSTCTL_MAX_OBJECTS_REACHED if the maximum of concurrent objects is reached.
+ * @param  enmType              Session object type to register.
+ * @param  fFlags               Registration flags. Not used yet and must be 0.
+ * @param  puObjectID           Returns registered object ID on success. Optional.
+ */
+int GuestSession::i_objectRegisterEx(SESSIONOBJECTTYPE enmType, uint32_t fFlags, uint32_t *puObjectID)
+{
+    RT_NOREF(fFlags);
+    AssertReturn(fFlags == 0, VERR_INVALID_PARAMETER);
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    int rc = VINF_SUCCESS;
+
+    uint32_t uObjectID;
+
+    if (mData.mObjects.size() < VBOX_GUESTCTRL_MAX_OBJECTS - 1 /* Minus 1 for the session itself */)
+    {
+        SessionObjects::reverse_iterator itRend = mData.mObjects.rbegin();
+        if (itRend != mData.mObjects.rend())
+            uObjectID = itRend->first + 1; /* Last key plus 1. */
+        else
+            uObjectID = 0;
+    }
+    else
+    {
+        /* Utilize our "free list" to get the next free object ID in the map. */
+        if (mData.mObjectsFree.size())
+        {
+            /* Always re-use the oldest object ID to avoid trouble. */
+            uObjectID = mData.mObjectsFree.front();
+            mData.mObjectsFree.pop_front();
+        }
+        else
+            rc = VERR_GSTCTL_MAX_OBJECTS_REACHED;
+    }
+
+    Log2Func(("enmType=%RU32, fFlags=%RU32 -> uObjectID=%RU32 (%zu objects, %zu on free list), rc=%Rrc\n",
+              enmType, fFlags, uObjectID, mData.mObjects.size(), mData.mObjectsFree.size(), rc));
+
+    if (RT_SUCCESS(rc))
+    {
+        mData.mObjects[uObjectID].enmType     = enmType;
+        mData.mObjects[uObjectID].tsCreatedMs = RTTimeMilliTS();
+
+        if (puObjectID)
+            *puObjectID = uObjectID;
+    }
+
+    return rc;
+}
+
+/**
+ * Unregisters a formerly registered object from a session.
+ *
+ * @return VBox status code. VERR_NOT_FOUND if object to unregister was not found.
+ * @param  uObjectID            Object ID to unregister.
+ */
+int GuestSession::i_objectUnregister(uint32_t uObjectID)
+{
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    SessionObjects::const_iterator itObj = mData.mObjects.find(uObjectID);
+    if (itObj != mData.mObjects.end())
+    {
+        Log2Func(("uObjectID=%RU32 (now %zu objects in free list)\n", uObjectID, mData.mObjectsFree.size()));
+
+        /* Note: Do not remove object from object list (mData.mObjects) here, as we continue operating
+         *       on the free list (mData.mObjectsFree) if we reached the object list's maximum. */
+
+        mData.mObjectsFree.push_back(uObjectID);
+        Assert(mData.mObjectsFree.size() <= VBOX_GUESTCTRL_MAX_OBJECTS);
+        return VINF_SUCCESS;
+    }
+
+    AssertFailed();
+    return VERR_NOT_FOUND;
+}
+
 int GuestSession::i_pathRename(const Utf8Str &strSource, const Utf8Str &strDest, uint32_t uFlags, int *prcGuest)
 {
@@ -1879 +1859 @@
 
     GuestWaitEvent *pEvent = NULL;
-    int vrc = registerWaitEvent(mData.mSession.mID, 0 /* Object ID */,
-                                &pEvent);
+    int vrc = registerWaitEvent(mData.mSession.mID, mData.mObjectID, &pEvent);
     if (RT_FAILURE(vrc))
         return vrc;
@@ -1926 +1905 @@
 
     GuestWaitEvent *pEvent = NULL;
-    int vrc = registerWaitEvent(mData.mSession.mID, 0 /* Object ID */, &pEvent);
+    int vrc = registerWaitEvent(mData.mSession.mID, mData.mObjectID, &pEvent);
     if (RT_FAILURE(vrc))
         return vrc;
@@ -1976 +1955 @@
 
     GuestWaitEvent *pEvent = NULL;
-    int vrc = registerWaitEvent(mData.mSession.mID, 0 /* Object ID */, &pEvent);
+    int vrc = registerWaitEvent(mData.mSession.mID, mData.mObjectID, &pEvent);
     if (RT_FAILURE(vrc))
         return vrc;
@@ -2011 +1990 @@
 }
 
-int GuestSession::i_processRemoveFromList(GuestProcess *pProcess)
+/**
+ * Unregisters a process object from a session.
+ *
+ * @return VBox status code. VERR_NOT_FOUND if the process is not registered (anymore).
+ * @param  pProcess             Process object to unregister from session.
+ */
+int GuestSession::i_processUnregister(GuestProcess *pProcess)
 {
     AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
@@ -2019 +2004 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    int rc = VERR_NOT_FOUND;
-
-    ULONG uPID;
-    HRESULT hr = pProcess->COMGETTER(PID)(&uPID);
+    const uint32_t uObjectID = pProcess->getObjectID();
+
+    LogFlowFunc(("Removing process (objectID=%RU32) ...\n", uObjectID));
+
+    int rc = i_objectUnregister(uObjectID);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    SessionProcesses::iterator itProcs = mData.mProcesses.find(uObjectID);
+    AssertReturn(itProcs != mData.mProcesses.end(), VERR_NOT_FOUND);
+
+    /* Make sure to consume the pointer before the one of the iterator gets released. */
+    ComObjPtr<GuestProcess> pProc = pProcess;
+
+    uint32_t uPID;
+    HRESULT hr = pProc->COMGETTER(PID)(&uPID);
     ComAssertComRC(hr);
 
-    LogFlowFunc(("Removing process (PID=%RU32) ...\n", uPID));
-
-    SessionProcesses::iterator itProcs = mData.mProcesses.begin();
-    while (itProcs != mData.mProcesses.end())
-    {
-        if (pProcess == itProcs->second)
-        {
-#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> 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 %zu processes, %RU32 objects)\n",
-                         pProcess->getObjectID(), mData.mSession.mID, uPID, mData.mProcesses.size() - 1, mData.mNumObjects - 1));
-
-            rc = pProcess->i_onRemove();
-            mData.mProcesses.erase(itProcs);
-            mData.mNumObjects--;
-
-            alock.release(); /* Release lock before firing off event. */
-
-            fireGuestProcessRegisteredEvent(mEventSource, this /* Session */, pProc,
-                                            uPID, false /* Process unregistered */);
-            pProc.setNull();
-            break;
-        }
-
-        ++itProcs;
-    }
+    LogFlowFunc(("Removing process ID=%RU32 (session %RU32, guest PID %RU32, now total %zu processes)\n",
+                 uObjectID, mData.mSession.mID, uPID, mData.mProcesses.size()));
+
+    rc = pProcess->i_onRemove();
+    AssertRCReturn(rc, rc);
+
+    mData.mProcesses.erase(itProcs);
+
+    alock.release(); /* Release lock before firing off event. */
+
+    fireGuestProcessRegisteredEvent(mEventSource, this /* Session */, pProc, uPID, false /* Process unregistered */);
+
+    pProc.setNull();
 
     LogFlowFuncLeaveRC(rc);
@@ -2129 +2100 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    int rc = VERR_GSTCTL_MAX_OBJECTS_REACHED;
-    if (mData.mNumObjects >= VBOX_GUESTCTRL_MAX_OBJECTS)
-        return rc;
-
-    /* Create a new (host-based) process ID and assign it. */
-    uint32_t uNewProcessID = 0;
-    ULONG uTries = 0;
-
-    for (;;)
-    {
-        /* Is the context ID already used? */
-        if (!i_processExists(uNewProcessID, NULL /* pProcess */))
-        {
-            /* Callback with context ID was not found. This means
-             * we can use this context ID for our new callback we want
-             * to add below. */
-            rc = VINF_SUCCESS;
-            break;
-        }
-        uNewProcessID++;
-        if (uNewProcessID == VBOX_GUESTCTRL_MAX_OBJECTS)
-            uNewProcessID = 0;
-
-        if (++uTries == VBOX_GUESTCTRL_MAX_OBJECTS)
-            break; /* Don't try too hard. */
-    }
-
+    /* Register a new object ID. */
+    uint32_t uObjectID;
+    int rc = i_objectRegister(SESSIONOBJECTTYPE_PROCESS, &uObjectID);
     if (RT_FAILURE(rc))
         return rc;
@@ -2164 +2111 @@
         return VERR_COM_UNEXPECTED;
 
-    rc = pProcess->init(mParent->i_getConsole() /* Console */, this /* Session */,
-                        uNewProcessID, procInfo, mData.mpBaseEnvironment);
+    rc = pProcess->init(mParent->i_getConsole() /* Console */, this /* Session */, uObjectID,
+                        procInfo, mData.mpBaseEnvironment);
     if (RT_FAILURE(rc))
         return rc;
@@ -2172 +2119 @@
     try
     {
-        mData.mProcesses[uNewProcessID] = pProcess;
-        mData.mNumObjects++;
-        Assert(mData.mNumObjects <= VBOX_GUESTCTRL_MAX_OBJECTS);
-
-        LogFlowFunc(("Added new process (Session: %RU32) with process ID=%RU32 (now total %zu processes, %RU32 objects)\n",
-                     mData.mSession.mID, uNewProcessID, mData.mProcesses.size(), mData.mNumObjects));
+        mData.mProcesses[uObjectID] = pProcess;
+
+        LogFlowFunc(("Added new process (Session: %RU32) with process ID=%RU32 (now total %zu processes)\n",
+                     mData.mSession.mID, uObjectID, mData.mProcesses.size()));
 
         alock.release(); /* Release lock before firing off event. */
 
-        fireGuestProcessRegisteredEvent(mEventSource, this /* Session */, pProcess,
-                                        0 /* PID */, true /* Process registered */);
+        fireGuestProcessRegisteredEvent(mEventSource, this /* Session */, pProcess, 0 /* PID */, true /* Process registered */);
     }
     catch (std::bad_alloc &)
@@ -2474 +2418 @@
         eventTypes.push_back(VBoxEventType_OnGuestSessionStateChanged);
 
-        vrc = registerWaitEvent(mData.mSession.mID, 0 /* Object ID */,
-                                eventTypes, &pEvent);
+        vrc = registerWaitEventEx(mData.mSession.mID, mData.mObjectID, eventTypes, &pEvent);
     }
     catch (std::bad_alloc)
@@ -2999 +2942 @@
 
     int rcGuest;
-    int rc = i_objectCreateTemp(aTemplateName, aPath, true /* Directory */, aDirectory, &rcGuest);
+    int rc = i_fsCreateTemp(aTemplateName, aPath, true /* Directory */, aDirectory, &rcGuest);
     if (!RT_SUCCESS(rc))
     {