Changeset 23675 in vbox for trunk/src/VBox/Main

Timestamp:

Oct 10, 2009 9:59:29 PM (15 years ago)

Author:

vboxsync

Message:

stringify Session state

Location:

trunk/src/VBox/Main

Files:

• Global.cpp (modified) (1 diff)
• MachineImpl.cpp (modified) (5 diffs)
• SessionImpl.cpp (modified) (6 diffs)
• include/Global.h (modified) (1 diff)

trunk/src/VBox/Main/Global.cpp

@@ -210 +210 @@
 }
 
+/*static*/ const char *
+Global::stringifySessionState(SessionState_T aState)
+{
+    switch (aState)
+    {
+        case SessionState_Null:         return "Null";
+        case SessionState_Closed:       return "Closed";
+        case SessionState_Open:         return "Open";
+        case SessionState_Spawning:     return "Spawning";
+        case SessionState_Closing:      return "Closing";
+        default:
+        {
+            AssertMsgFailed(("%d (%#x)\n", aState, aState));
+            static char s_szMsg[48];
+            RTStrPrintf(s_szMsg, sizeof(s_szMsg), "InvalidState-0x%08x\n", aState);
+            return s_szMsg;
+        }
+
+    }
+}
+
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */

trunk/src/VBox/Main/MachineImpl.cpp

@@ -3034 +3034 @@
         if (mData->mSession.mState != SessionState_Open)
             return setError(VBOX_E_INVALID_VM_STATE,
-                            tr("Machine session is not open (session state: %d)"),
-                            mData->mSession.mState);
+                            tr("Machine session is not open (session state: %s)"),
+                            Global::stringifySessionState(mData->mSession.mState));
 
         directControl = mData->mSession.mDirectControl;
@@ -3061 +3061 @@
         if (mData->mSession.mState != SessionState_Open)
             return setError(E_FAIL,
-                            tr("Machine session is not open (session state: %d)"),
-                            mData->mSession.mState);
+                            tr("Machine session is not open (session state: %s)"),
+                            Global::stringifySessionState(mData->mSession.mState));
 
         directControl = mData->mSession.mDirectControl;
@@ -3672 +3672 @@
                         mUserData->mName.raw());
 
-    LogFlowThisFunc(("mSession.mState=%d\n", mData->mSession.mState));
+    LogFlowThisFunc(("mSession.mState=%s\n", Global::stringifySessionState(mData->mSession.mState)));
 
     if (mData->mSession.mState == SessionState_Open ||
@@ -3889 +3889 @@
                         mUserData->mName.raw());
 
-    LogFlowThisFunc(("mSession.mState=%d\n", mData->mSession.mState));
+    LogFlowThisFunc(("mSession.mState=%s\n", Global::stringifySessionState(mData->mSession.mState)));
 
     if (mData->mSession.mState == SessionState_Open ||
@@ -4126 +4126 @@
             tr ("The machine '%ls' is not registered"), mUserData->mName.raw());
 
-    LogFlowThisFunc(("mSession.state=%d\n", mData->mSession.mState));
+    LogFlowThisFunc(("mSession.state=%s\n", Global::stringifySessionState(mData->mSession.mState)));
 
     if (mData->mSession.mState != SessionState_Open)

trunk/src/VBox/Main/SessionImpl.cpp

@@ -30 +30 @@
 #include "SessionImpl.h"
 #include "ConsoleImpl.h"
+#include "Global.h"
 
 #include "Logging.h"
@@ -50 +51 @@
         if (mState != SessionState_Open) \
             return setError (E_UNEXPECTED, \
-                tr ("The session is not open")); \
+                tr ("The session is not open (session state: %s)"), \
+                Global::stringifySessionState(mState)); \
     } while (0)
 
@@ -466 +468 @@
         AutoWriteLock alock(this);
 
-        LogFlowThisFunc(("mState=%d, mType=%d\n", mState, mType));
+        LogFlowThisFunc(("mState=%s, mType=%d\n", Global::stringifySessionState(mState), mType));
 
         if (mState == SessionState_Closing)
@@ -675 +677 @@
     if (mState != SessionState_Open)
         return setError (VBOX_E_INVALID_VM_STATE,
-            tr ("Machine session is not open (session state: %d)."),
-            mState);
+            tr ("Machine session is not open (session state: %s)."),
+            Global::stringifySessionState(mState));
     AssertReturn(mType == SessionType_Direct, VBOX_E_INVALID_OBJECT_STATE);
     CheckComArgNotNull(aName);
@@ -712 +714 @@
     if (mState != SessionState_Open)
         return setError (VBOX_E_INVALID_VM_STATE,
-            tr ("Machine session is not open (session state: %d)."),
-            mState);
+            tr ("Machine session is not open (session state: %s)."),
+            Global::stringifySessionState(mState));
     AssertReturn(mType == SessionType_Direct, VBOX_E_INVALID_OBJECT_STATE);
     if (!VALID_PTR (aPatterns) && (aPatterns != NULL))
@@ -758 +760 @@
     AutoWriteLock alock(this);
 
-    LogFlowThisFunc(("mState=%d, mType=%d\n", mState, mType));
+    LogFlowThisFunc(("mState=%s, mType=%d\n", Global::stringifySessionState(mState), mType));
 
     if (mState != SessionState_Open)

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

@@ -122 +122 @@
      */
     static const char *stringifyMachineState(MachineState_T aState);
+
+    /**
+     * Stringify a session state.
+     *
+     * @returns Pointer to a read only string.
+     * @param   aState      Valid session state.
+     */
+    static const char *stringifySessionState(MachineState_T aState);
 };