Changeset 40767 in vbox for trunk/src/VBox/HostServices

Timestamp:

Apr 5, 2012 9:47:33 AM (13 years ago)

Author:

vboxsync

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

77263

Message:

also enumerate guest properties during guru meditation

File:

• trunk/src/VBox/HostServices/GuestProperties/service.cpp (modified) (5 diffs)

trunk/src/VBox/HostServices/GuestProperties/service.cpp

@@ -52 +52 @@
 #include <iprt/thread.h>
 #include <iprt/time.h>
+#include <VBox/vmm/dbgf.h>
 
 #include <memory>  /* for auto_ptr */
@@ -359 +360 @@
         return VINF_SUCCESS;
     }
+
 private:
     static DECLCALLBACK(int) reqThreadFn(RTTHREAD ThreadSelf, void *pvUser);
@@ -383 +385 @@
     int hostCall(uint32_t eFunction, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
     int uninit();
+    void dbgInfoShow(PCDBGFINFOHLP pHlp);
+    static DECLCALLBACK(void) dbgInfo(void *pvUser, PCDBGFINFOHLP pHlp, const char *pszArgs);
 };
 
@@ -1252 +1256 @@
 }
 
+/**
+ * Enumeration data shared between dbgInfoCallback and Service::dbgInfoShow.
+ */
+typedef struct ENUMDBGINFO
+{
+    PCDBGFINFOHLP pHlp;
+} ENUMDBGINFO;
+
+static DECLCALLBACK(int) dbgInfoCallback(PRTSTRSPACECORE pStr, void *pvUser)
+{
+    Property *pProp = (Property *)pStr;
+    PCDBGFINFOHLP pHlp = ((ENUMDBGINFO*)pvUser)->pHlp;
+
+    char szFlags[MAX_FLAGS_LEN];
+    int rc = writeFlags(pProp->mFlags, szFlags);
+    if (RT_FAILURE(rc))
+        RTStrPrintf(szFlags, sizeof(szFlags), "???");
+
+    pHlp->pfnPrintf(pHlp, "%s: '%s', %RU64",
+                    pProp->mName.c_str(), pProp->mValue.c_str(), pProp->mTimestamp);
+    if (strlen(szFlags))
+        pHlp->pfnPrintf(pHlp, " (%s)", szFlags);
+    pHlp->pfnPrintf(pHlp, "\n");
+    return 0;
+}
+
+void Service::dbgInfoShow(PCDBGFINFOHLP pHlp)
+{
+    ENUMDBGINFO EnumData = { pHlp };
+    RTStrSpaceEnumerate(&mhProperties, dbgInfoCallback, &EnumData);
+}
+
+/**
+ * Handler for debug info.
+ *
+ * @param   pvUser      user pointer.
+ * @param   pHlp        The info helper functions.
+ * @param   pszArgs     Arguments, ignored.
+ */
+void Service::dbgInfo(void *pvUser, PCDBGFINFOHLP pHlp, const char *pszArgs)
+{
+    SELF *pSelf = reinterpret_cast<SELF *>(pvUser);
+    pSelf->dbgInfoShow(pHlp);
+}
+
 
 /**
@@ -1317 +1366 @@
                 else
                     rc = VERR_INVALID_PARAMETER;
+                break;
+
+            case GET_DBGF_INFO_FN:
+                if (cParms != 2)
+                    return VERR_INVALID_PARAMETER;
+                paParms[0].u.pointer.addr = (void*)(uintptr_t)dbgInfo;
+                paParms[1].u.pointer.addr = (void*)this;
                 break;