[SEARCH_VIEW] Investigate high RAM consumption

This patch introduces various optimizations of RAM consumption and, consequently, CPU consumption. All optimizations were proven to be functional with the Valgrind Massif tool. Signed-off-by: Vladyslav Goncharuk <vladyslav_goncharuk@epam.com>
svlad-90 · Jun 13, 2024 · c58dd9a · c58dd9a
1 parent e7aa167
commit c58dd9a
Show file tree

Hide file tree

Showing 14 changed files with 568 additions and 459 deletions.
diff --git a/dltmessageanalyzerplugin/src/common/BaseDefinitions.cpp b/dltmessageanalyzerplugin/src/common/BaseDefinitions.cpp
@@ -8,5 +8,5 @@
 
 bool QOptionalColor::operator== ( const QOptionalColor& rhs ) const
 {
-    return color == rhs.color && isSet == rhs.isSet;
+    return color_code == rhs.color_code && isSet == rhs.isSet;
 }
diff --git a/dltmessageanalyzerplugin/src/common/BaseDefinitions.hpp b/dltmessageanalyzerplugin/src/common/BaseDefinitions.hpp
@@ -40,7 +40,7 @@ Q_DECLARE_METATYPE(tQStringPtrWrapper)
 struct QOptionalColor
 {
     bool isSet = false;
-    QColor color;
+    QRgb color_code;
     bool operator== ( const QOptionalColor& rhs ) const;
 };
 typedef QVector<QOptionalColor> QOptionalColorVec;

diff --git a/dltmessageanalyzerplugin/src/common/CTreeItem.cpp b/dltmessageanalyzerplugin/src/common/CTreeItem.cpp
@@ -423,18 +423,18 @@ CTreeItem::CTreeItem(CTreeItem *pParent,
                      const tHandleDuplicateFunc& handleDuplicateFunc,
                      const tFindItemFunc& findFunc)
     :
-      mData(),
-      mHandleDuplicateFunc(handleDuplicateFunc),
       mChildItems(),
-      mpParentItem(pParent),
-      mSortedChildren(),
-      mbFirstLevelSorted(true),
-      mbWholeSorted(true),
-      mSortingColumn(defaultSortingColumn),
-      mSortOrder(Qt::SortOrder::DescendingOrder),
       mSortingFunction(sortingFunction),
       mFindFunc(findFunc),
-      mpGuard(std::make_shared<int>(0))
+      mHandleDuplicateFunc(handleDuplicateFunc),
+      mData(),
+      mSortedChildren(),
+      mpGuard(std::make_shared<int>(0)),
+      mpParentItem(pParent),
+      mSortOrder(Qt::SortOrder::DescendingOrder),
+      mSortingColumn(defaultSortingColumn),
+      mbFirstLevelSorted(true),
+      mbWholeSorted(true)
 {}
 
 tTreeItemPtr CTreeItem::appendChild(const tDataItem& key, const tData& additionItems)

diff --git a/dltmessageanalyzerplugin/src/common/CTreeItem.hpp b/dltmessageanalyzerplugin/src/common/CTreeItem.hpp
@@ -253,19 +253,20 @@ class CTreeItem
     void setIdx(const int& val);
 
 private:
-    tData mData;
-    tHandleDuplicateFunc mHandleDuplicateFunc;
+
     tChildrenMap mChildItems;
-    tTreeItemPtr mpParentItem;
-    QVector<tTreeItemPtr> mSortedChildren;
-    bool mbFirstLevelSorted;
-    bool mbWholeSorted;
-    int mSortingColumn;
-    Qt::SortOrder mSortOrder;
     tSortingFunction mSortingFunction;
     tFindItemFunc mFindFunc;
-    int mIdx; // idx in parent's collection
+    tHandleDuplicateFunc mHandleDuplicateFunc;
+    tData mData;
+    QVector<tTreeItemPtr> mSortedChildren;
     tGuarded mpGuard;
+    tTreeItemPtr mpParentItem;
+    Qt::SortOrder mSortOrder;
+    int mIdx; // idx in parent's collection
+    int mSortingColumn;
+    bool mbFirstLevelSorted;
+    bool mbWholeSorted;
 };
 
 #endif // CTreeItem_HPP