Changeset 101095 in vbox

Timestamp:

Sep 12, 2023 10:55:48 PM (19 months ago)

Author:

vboxsync

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

159064

Message:

VBoxDbg: Fixed statistics refresh bug and changed some of QModelIndex returning methods to use Assert() more.

File:

• trunk/src/VBox/Debugger/VBoxDbgStatsQt.cpp (modified) (7 diffs)

trunk/src/VBox/Debugger/VBoxDbgStatsQt.cpp

@@ -81 +81 @@
     /** The node should be refreshed. */
     kDbgGuiStatsNodeState_kRefresh,
+#if 0 /// @todo not implemented
     /** diff: The node equals. */
     kDbgGuiStatsNodeState_kDiffEqual,
@@ -91 +92 @@
     /** diff: The node is only in set 2. */
     kDbgGuiStatsNodeState_kDiffOnlyIn2,
+#endif
     /** The end of the valid state values. */
     kDbgGuiStatsNodeState_kEnd
@@ -1899 +1901 @@
     if (m_fUpdateInsertRemove)
     {
-        /* emit layoutChanged(); - hrmpf, doesn't work reliably... */
-        beginResetModel();
+#if 0 // hrmpf, layoutChanged() didn't work reliably at some point so doing this as well... 
+        beginResetModel();  
         endResetModel();
+#else
+        emit layoutChanged();
+#endif
     }
     else
@@ -1928 +1933 @@
                 Assert(Stack.iTop < (int32_t)RT_ELEMENTS(Stack.a));
                 Stack.a[Stack.iTop].pNode = pNode->papChildren[iChild];
-                Stack.a[Stack.iTop].iChild = 0;
+                Stack.a[Stack.iTop].iChild = -1;
             }
             else
@@ -1945 +1950 @@
                     if (iChild >= pNode->cChildren)
                         break;
-                    QModelIndex TopLeft = createIndex(iChild, 0, pNode->papChildren[iChild]);
+                    QModelIndex const TopLeft = createIndex(iChild, 2, pNode->papChildren[iChild]);
                     pNode->papChildren[iChild]->enmState = kDbgGuiStatsNodeState_kVisible;
 
-                    /* any subsequent nodes that also needs refreshing? */
-                    if (   ++iChild < pNode->cChildren
-                        && pNode->papChildren[iChild]->enmState == kDbgGuiStatsNodeState_kRefresh)
-                    {
-                        do  pNode->papChildren[iChild]->enmState = kDbgGuiStatsNodeState_kVisible;
-                        while (   ++iChild < pNode->cChildren
-                               && pNode->papChildren[iChild]->enmState == kDbgGuiStatsNodeState_kRefresh);
-                        QModelIndex BottomRight = createIndex(iChild - 1, DBGGUI_STATS_COLUMNS - 1, pNode->papChildren[iChild - 1]);
-
-                        /* emit the refresh signal */
-                        emit dataChanged(TopLeft, BottomRight);
-                    }
-                    else
-                    {
-                        /* emit the refresh signal */
-                        emit dataChanged(TopLeft, TopLeft);
-                    }
+                    /* Any subsequent nodes that also needs refreshing? */
+                    while (   iChild + 1 < pNode->cChildren
+                           && pNode->papChildren[iChild + 1]->enmState == kDbgGuiStatsNodeState_kRefresh)
+                        iChild++;
+
+                    /* emit the refresh signal */
+                    QModelIndex const BottomRight = createIndex(iChild, DBGGUI_STATS_COLUMNS - 2, pNode->papChildren[iChild]);
+                    emit dataChanged(TopLeft, BottomRight);
+                    iChild++;
                 }
             }
@@ -2152 +2149 @@
 {
     PDBGGUISTATSNODE pParent = nodeFromIndex(a_rParent);
-    if (!pParent)
-    {
-        if (    a_rParent.isValid()
-            ||  iRow
-            ||  (unsigned)iColumn < DBGGUI_STATS_COLUMNS)
-        {
-            Assert(!a_rParent.isValid());
-            Assert(!iRow);
-            Assert((unsigned)iColumn < DBGGUI_STATS_COLUMNS);
-            return QModelIndex();
-        }
-
-        /* root */
-        return createIndex(0, iColumn, m_pRoot);
-    }
-    if ((unsigned)iRow >= pParent->cChildren)
-    {
-        Log(("index: iRow=%d >= cChildren=%u (iColumn=%d)\n", iRow, (unsigned)pParent->cChildren, iColumn));
-        return QModelIndex(); /* bug? */
-    }
-    if ((unsigned)iColumn >= DBGGUI_STATS_COLUMNS)
-    {
-        Log(("index: iColumn=%d (iRow=%d)\n", iColumn, iRow));
-        return QModelIndex(); /* bug? */
-    }
-    PDBGGUISTATSNODE pChild = pParent->papChildren[iRow];
-    return createIndex(iRow, iColumn, pChild);
+    if (pParent)
+    {
+        AssertMsgReturn((unsigned)iRow < pParent->cChildren,
+                        ("iRow=%d >= cChildren=%u (iColumn=%d)\n", iRow, (unsigned)pParent->cChildren, iColumn),
+                        QModelIndex());
+        AssertMsgReturn((unsigned)iColumn < DBGGUI_STATS_COLUMNS, ("iColumn=%d (iRow=%d)\n", iColumn, iRow), QModelIndex());
+
+        PDBGGUISTATSNODE pChild = pParent->papChildren[iRow];
+        return createIndex(iRow, iColumn, pChild);
+    }
+
+    /* root?  */
+    AssertReturn(a_rParent.isValid(), QModelIndex());
+    AssertMsgReturn(iRow == 0 && (unsigned)iColumn < DBGGUI_STATS_COLUMNS, ("iRow=%d iColumn=%d", iRow, iColumn), QModelIndex());
+    return createIndex(0, iColumn, m_pRoot);
 }
 
@@ -2443 +2428 @@
 {
     unsigned iCol = a_rIndex.column();
-    if (iCol >= DBGGUI_STATS_COLUMNS)
-        return QVariant();
+    AssertMsgReturn(iCol < DBGGUI_STATS_COLUMNS, ("%d\n", iCol), QVariant());
+    Log4(("Model::data(%p(%d,%d), %d)\n", nodeFromIndex(a_rIndex), iCol, a_rIndex.row(), a_eRole));
 
     if (a_eRole == Qt::DisplayRole)
     {
         PDBGGUISTATSNODE pNode = nodeFromIndex(a_rIndex);
-        if (!pNode)
-            return QVariant();
+        AssertReturn(pNode, QVariant());
 
         switch (iCol)