vbox的更動 46593 路徑 trunk/src/VBox/Debugger/VBoxDbgStatsQt4.cpp

時間撮記:

2013-6-17 下午02:32:51 (11 年 以前)

作者:

vboxsync

訊息:

updates

檔案:

• trunk/src/VBox/Debugger/VBoxDbgStatsQt4.cpp (修改) (8 筆差異)

trunk/src/VBox/Debugger/VBoxDbgStatsQt4.cpp

@@ -353 +353 @@
      */
     static ssize_t getNodePath(PCDBGGUISTATSNODE pNode, char *psz, ssize_t cch);
+
+    /**
+     * Calculates the full path of a node, returning the string pointer.
+     *
+     * @returns @a psz. On failure, NULL.
+     *
+     * @param   pNode       The node.
+     * @param   psz         The output buffer.
+     * @param   cch         The size of the buffer.
+     */
+    static char *getNodePath2(PCDBGGUISTATSNODE pNode, char *psz, ssize_t cch);
 
     /**
@@ -1312 +1323 @@
 
 
+/*static*/ char *
+VBoxDbgStatsModel::getNodePath2(PCDBGGUISTATSNODE pNode, char *psz, ssize_t cch)
+{
+    if (VBoxDbgStatsModel::getNodePath(pNode, psz, cch) < 0)
+        return NULL;
+    return psz;
+}
+
+
+
 /*static*/ bool
 VBoxDbgStatsModel::isNodeAncestorOf(PCDBGGUISTATSNODE pAncestor, PCDBGGUISTATSNODE pDescendant)
@@ -1434 +1455 @@
 VBoxDbgStatsModel::updateCallbackHandleOutOfOrder(const char *pszName)
 {
+#if defined(VBOX_STRICT) || defined(LOG_ENABLED)
+    char szStrict[1024];
+#endif
+
     /*
      * We might be inserting a new node between pPrev and pNode
@@ -1451 +1476 @@
     PDBGGUISTATSNODE pNode = m_pUpdateParent->papChildren[m_iUpdateChild];
     PDBGGUISTATSNODE const pPrev = prevDataNode(pNode);
+    AssertMsg(strcmp(pszName, getNodePath2(pNode, szStrict, sizeof(szStrict))), ("%s\n", szStrict));
+    AssertMsg(strcmp(pszName, getNodePath2(pPrev, szStrict, sizeof(szStrict))), ("%s\n", szStrict));
+    Log(("updateCallbackHandleOutOfOrder: pszName='%s' m_szUpdateParent='%s' m_cchUpdateParent=%u pNode='%s'\n",
+         pszName, m_szUpdateParent, m_cchUpdateParent, getNodePath2(pNode, szStrict, sizeof(szStrict))));
+
     pNode = pNode->pParent;
     while (pNode != m_pRoot)
@@ -1459 +1489 @@
         m_cchUpdateParent -= pNode->cchName + 1;
         m_szUpdateParent[m_cchUpdateParent] = '\0';
+        Log2(("updateCallbackHandleOutOfOrder: m_szUpdateParent='%s' m_cchUpdateParent=%u, removed '/%s' (%u)\n", m_szUpdateParent, m_cchUpdateParent, pNode->pszName, __LINE__));
         pNode = pNode->pParent;
     }
@@ -1470 +1501 @@
     {
         /* Find the end of this component. */
-        const char *const pszSubName = &pszName[m_cchUpdateParent];
+        const char * const pszSubName = &pszName[m_cchUpdateParent];
         const char *pszEnd = strchr(pszSubName, '/');
         if (!pszEnd)
@@ -1482 +1513 @@
         m_szUpdateParent[m_cchUpdateParent] = '\0';
         Assert(m_cchUpdateParent < sizeof(m_szUpdateParent));
+        Log2(("updateCallbackHandleOutOfOrder: m_szUpdateParent='%s' m_cchUpdateParent=%u (%u)\n", m_szUpdateParent, m_cchUpdateParent, __LINE__));
 
         if (!pNode->cChildren)
@@ -1571 +1603 @@
     m_pUpdateParent = pNode->pParent;
     m_iUpdateChild = pNode->iSelf;
+    Log2(("updateCallbackHandleOutOfOrder: m_szUpdateParent='%s' m_cchUpdateParent=%u (%u)\n", m_szUpdateParent, m_cchUpdateParent, __LINE__));
 
     return pNode;