Changeset 24934 in vbox for trunk/src

Timestamp:

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

Author:

vboxsync

Message:

Main: Logging.

Location:

trunk/src/VBox/Main

Files:

• MediumAttachmentImpl.cpp (modified) (5 diffs)
• include/MediumAttachmentImpl.h (modified) (2 diffs)

trunk/src/VBox/Main/MediumAttachmentImpl.cpp

@@ -22 +22 @@
 #include "MediumAttachmentImpl.h"
 #include "MachineImpl.h"
+#include "Global.h"
 
 #include "Logging.h"
@@ -89 +90 @@
     autoInitSpan.setSucceeded();
 
-    LogFlowThisFuncLeave();
+    /* Construct a short log name for this attachment. */
+    Utf8Str ctlName(aControllerName);
+    const char *psz = strpbrk(ctlName.c_str(), " \t:-");
+    mLogName = Utf8StrFmt("MA%p[%.*s:%u:%u:%s%s]",
+                          this,
+                          psz ? psz - ctlName.c_str() : 4, ctlName.c_str(),
+                          aPort, aDevice, Global::stringifySessionState(aType),
+                          aImplicit ? ":I" : "");
+
+    LogFlowThisFunc(("LEAVE - %s\n", logName()));
     return S_OK;
 }
@@ -99 +109 @@
 void MediumAttachment::uninit()
 {
-    LogFlowThisFuncEnter();
+    LogFlowThisFunc(("ENTER - %s\n", logName()));
 
     /* Enclose the state transition Ready->InUninit->NotReady */
@@ -118 +128 @@
 bool MediumAttachment::rollback()
 {
-    LogFlowThisFuncEnter();
+    LogFlowThisFunc(("ENTER - %s\n", logName()));
 
     /* sanity */
@@ -136 +146 @@
     }
 
-    LogFlowThisFuncLeave();
+    LogFlowThisFunc(("LEAVE - %s - returning %RTbool\n", logName(), changed));
     return changed;
 }

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

@@ -109 +109 @@
     }
 
+    /** Get a unique and somewhat descriptive name for logging. */
+    const char *logName(void) const { return mLogName.c_str(); }
+
     /** For com::SupportErrorInfoImpl. */
     static const char *ComponentName() { return "MediumAttachment"; }
@@ -144 +147 @@
 
     Backupable<Data> m;
+
+    Utf8Str mLogName;                   /**< For logging purposes */
 };