Changeset 24933 in vbox for trunk

Timestamp:

Nov 25, 2009 10:50:21 AM (15 years ago)

Author:

vboxsync

Message:

Main: Logging.

Location:

trunk/src/VBox/Main

Files:

• Global.cpp (modified) (2 diffs)
• MediumImpl.cpp (modified) (5 diffs)
• include/Global.h (modified) (1 diff)

trunk/src/VBox/Main/Global.cpp

@@ -213 +213 @@
             return s_szMsg;
         }
-
     }
 }
@@ -234 +233 @@
             return s_szMsg;
         }
-
+    }
+}
+
+/*static*/ const char *
+Global::stringifyDeviceType(DeviceType_T aType)
+{
+    switch (aType)
+    {
+        case DeviceType_Null:         return "Null";
+        case DeviceType_Floppy:       return "Floppy";
+        case DeviceType_DVD:          return "DVD";
+        case DeviceType_HardDisk:     return "HardDisk";
+        case DeviceType_Network:      return "Network";
+        case DeviceType_USB:          return "USB";
+        case DeviceType_SharedFolder: return "ShardFolder";
+        default:
+        {
+            AssertMsgFailed(("%d (%#x)\n", aType, aType));
+            static char s_szMsg[48];
+            RTStrPrintf(s_szMsg, sizeof(s_szMsg), "InvalidType-0x%08x\n", aType);
+            return s_szMsg;
+        }
     }
 }

trunk/src/VBox/Main/MediumImpl.cpp

@@ -338 +338 @@
 HRESULT Medium::Task::runNow()
 {
+    /* NIL_RTTHREAD indicates synchronous call. */
     Medium::taskThread(NIL_RTTHREAD, this);
 
@@ -1933 +1934 @@
             m->preLockState = m->state;
 
-            LogFlowThisFunc(("Okay - prev state=%d\n", m->state));
+            LogFlowThisFunc(("Okay - prev state=%d locationFull=%s\n", m->state, locationFull().c_str()));
             m->state = MediumState_LockedWrite;
             break;
@@ -1939 +1940 @@
         default:
         {
-            LogFlowThisFunc(("Failing - state=%d\n", m->state));
+            LogFlowThisFunc(("Failing - state=%d locationFull=%s\n", m->state, locationFull().c_str()));
             rc = setStateError();
             break;
@@ -1966 +1967 @@
         {
             m->state = m->preLockState;
-            LogFlowThisFunc(("new state=%d\n", m->state));
+            LogFlowThisFunc(("new state=%d locationFull=%s\n", m->state, locationFull().c_str()));
             break;
         }
         default:
         {
-            LogFlowThisFunc(("Failing - state=%d\n", m->state));
+            LogFlowThisFunc(("Failing - state=%d locationFull=%s\n", m->state, locationFull().c_str()));
             rc = setError(VBOX_E_INVALID_OBJECT_STATE,
                           tr ("Medium '%s' is not locked for writing"),
@@ -4024 +4025 @@
 
     AutoMultiWriteLock2 alock(mVirtualBox->lockHandle(), this->lockHandle());
+    LogFlowThisFunc(("aWait=%RTbool locationFull=%s\n", aWait, locationFull().c_str() ));
 
     if (    !(m->formatObj->capabilities() & (   MediumFormatCapabilities_CreateDynamic

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

@@ -163 +163 @@
 
     /**
+     * Stringify a device type.
+     *
+     * @returns Pointer to a read only string.
+     * @param   aType       The device type.
+     */
+    static const char *stringifyDeviceType(DeviceType_T aType);
+
+    /**
      * Try convert a COM status code to a VirtualBox status code (VBox/err.h).
      *