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

Timestamp:

Sep 11, 2013 2:08:36 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

88879

Message:

Main/Machine+Session: New generic client session watcher implementation based on token objects, works on all platforms and is used for now on XPCOM. Additionally a better error message when several API clients are racing for a lock, previously it could be quite confusing.

Location:

trunk/src/VBox/Main/src-client

Files:

• ClientTokenHolder.cpp (modified) (5 diffs)
• SessionImpl.cpp (modified) (2 diffs)

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

@@ -1 +1 @@
 /** @file
  *
- * VirtualBox API client token holder (in the client process)
+ * VirtualBox API client session token holder (in the client process)
  */
 
@@ -101 +101 @@
     }
 
+#elif defined(VBOX_WITH_GENERIC_SESSION_WATCHER)
+
+    if (!mToken.isNull())
+    {
+        mToken->Abandon();
+        mToken.setNull();
+    }
+
 #else
 # error "Port me!"
@@ -106 +114 @@
 }
 
+#ifndef VBOX_WITH_GENERIC_SESSION_WATCHER
 Session::ClientTokenHolder::ClientTokenHolder(const Utf8Str &strTokenId) :
     mClientTokenId(strTokenId)
-{
+#else /* VBOX_WITH_GENERIC_SESSION_WATCHER */
+Session::ClientTokenHolder::ClientTokenHolder(IToken *aToken) :
+    mToken(aToken)
+#endif /* VBOX_WITH_GENERIC_SESSION_WATCHER */
+{
+#ifdef CTHSEMTYPE
     mSem = CTHSEMARG;
+#endif
+#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
     mThread = NIL_RTTHREAD;
+#endif
 
 #if defined(RT_OS_WINDOWS)
@@ -200 +217 @@
     mSem = s;
 
+#elif defined(VBOX_WITH_GENERIC_SESSION_WATCHER)
+
+    /* nothing to do */
+
 #else
 # error "Port me!"
@@ -207 +228 @@
 bool Session::ClientTokenHolder::isReady()
 {
+#ifndef VBOX_WITH_GENERIC_SESSION_WATCHER
     return mSem != CTHSEMARG;
+#else /* VBOX_WITH_GENERIC_SESSION_WATCHER */
+    return !mToken.isNull();
+#endif /* VBOX_WITH_GENERIC_SESSION_WATCHER */
 }
 

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

@@ -294 +294 @@
 }
 
+#ifndef VBOX_WITH_GENERIC_SESSION_WATCHER
 STDMETHODIMP Session::AssignMachine(IMachine *aMachine, LockType_T aLockType,
                                     IN_BSTR aTokenId)
+#else /* VBOX_WITH_GENERIC_SESSION_WATCHER */
+STDMETHODIMP Session::AssignMachine(IMachine *aMachine, LockType_T aLockType,
+                                    IToken *aToken)
+#endif /* VBOX_WITH_GENERIC_SESSION_WATCHER */
 {
     LogFlowThisFuncEnter();
@@ -338 +343 @@
 #endif
 
+#ifndef VBOX_WITH_GENERIC_SESSION_WATCHER
     Utf8Str strTokenId(aTokenId);
     Assert(!strTokenId.isEmpty());
+#else /* VBOX_WITH_GENERIC_SESSION_WATCHER */
+    AssertPtr(aToken);
+#endif /* VBOX_WITH_GENERIC_SESSION_WATCHER */
     /* create the machine client token */
     try
     {
+#ifndef VBOX_WITH_GENERIC_SESSION_WATCHER
         mClientTokenHolder = new ClientTokenHolder(strTokenId);
+#else /* VBOX_WITH_GENERIC_SESSION_WATCHER */
+        mClientTokenHolder = new ClientTokenHolder(aToken);
+#endif /* VBOX_WITH_GENERIC_SESSION_WATCHER */
         if (!mClientTokenHolder->isReady())
         {