LRU for main table model (#575)

* Add generic lrucache structure * Use LRU cache * Use LRU cache 2 * Handle color of corrupted messages Signed-off-by: Viktor Kopp <[email protected]>
COVESA · Nov 15, 2024 · 77c0efc · 77c0efc
1 parent f9f45ed
commit 77c0efc
Show file tree

Hide file tree

Showing 10 changed files with 164 additions and 197 deletions.
diff --git a/qdlt/CMakeLists.txt b/qdlt/CMakeLists.txt
@@ -41,7 +41,8 @@ add_library(qdlt SHARED
     qdltimporter.cpp
     fieldnames.cpp
     dltmessagematcher.cpp
-    dltmessagematcher.h)
+    dltmessagematcher.h
+    qdltlrucache.hpp)
 
 target_compile_definitions(qdlt PRIVATE
     BYTE_ORDER=LITTLE_ENDIAN

diff --git a/qdlt/qdltfile.cpp b/qdlt/qdltfile.cpp
@@ -487,7 +487,7 @@ void QDltFile::addFilterIndex (int index)
 }
 
 #ifdef USECOLOR
-    QColor QDltFile::checkMarker(QDltMsg &msg)
+    QColor QDltFile::checkMarker(const QDltMsg &msg)
     {
         if(!filterFlag)
         {
@@ -498,7 +498,7 @@ void QDltFile::addFilterIndex (int index)
     }
 
 #else
- QString QDltFile::checkMarker(QDltMsg &msg)
+ QString QDltFile::checkMarker(const QDltMsg &msg)
  {
      if(!filterFlag)
      {

diff --git a/qdlt/qdltfile.h b/qdlt/qdltfile.h
@@ -252,9 +252,9 @@ class QDLT_EXPORT QDltFile : public QDlt
       \return 0 if message will not be marked, colour if message will be marked
     */
 #ifdef USECOLOR
-    QColor checkMarker(QDltMsg &msg);
+    QColor checkMarker(const QDltMsg &msg);
 #else
-    QString checkMarker(QDltMsg &msg);
+    QString checkMarker(const QDltMsg &msg);
 #endif
 
     //! Get file name of the underlying file object

diff --git a/qdlt/qdltfilter.cpp b/qdlt/qdltfilter.cpp
@@ -161,7 +161,7 @@ bool QDltFilter::compileRegexps()
             appidRegularExpression.isValid());
 }
 
-bool QDltFilter::match(QDltMsg &msg) const
+bool QDltFilter::match(const QDltMsg &msg) const
 {
 
     if( (true == enableEcuid) && (msg.getEcuid() != ecuid))

diff --git a/qdlt/qdltfilter.h b/qdlt/qdltfilter.h
@@ -130,7 +130,7 @@ class QDLT_EXPORT QDltFilter
     /*!
       \return true if filter matches the message, else false
     */
-    bool match(QDltMsg &msg) const;
+    bool match(const QDltMsg &msg) const;
 
     //! Save filter parameters in XML file.
     /*!

diff --git a/qdlt/qdltfilterlist.cpp b/qdlt/qdltfilterlist.cpp
@@ -86,7 +86,7 @@ void QDltFilterList::addFilter(QDltFilter *_filter)
 
 
 #ifdef USECOLOR
-QColor QDltFilterList::checkMarker(QDltMsg &msg)
+QColor QDltFilterList::checkMarker(const QDltMsg &msg)
 {
     QDltFilter *filter;
     QColor color;
@@ -104,7 +104,7 @@ QColor QDltFilterList::checkMarker(QDltMsg &msg)
     return color;
 }
 #else
-QString QDltFilterList::checkMarker(QDltMsg &msg)
+QString QDltFilterList::checkMarker(const QDltMsg &msg)
 {
     QDltFilter *filter;
     QString color=""; // invalid colour

diff --git a/qdlt/qdltfilterlist.h b/qdlt/qdltfilterlist.h
@@ -83,9 +83,9 @@ class QDLT_EXPORT QDltFilterList
       \return 0 if message will not be marked, colour if message will be marked
     */
 #ifdef USECOLOR
-    QColor checkMarker(QDltMsg &msg);
+    QColor checkMarker(const QDltMsg &msg);
 #else
-    QString checkMarker(QDltMsg &msg);
+    QString checkMarker(const QDltMsg &msg);
 #endif
 
 

diff --git a/qdlt/qdltlrucache.hpp b/qdlt/qdltlrucache.hpp
@@ -0,0 +1,59 @@
+#ifndef QDLTLRUCACHE_HPP
+#define QDLTLRUCACHE_HPP
+
+#include <unordered_map>
+#include <list>
+#include <stdexcept>
+
+template<typename Key, typename Value>
+class QDltLruCache {
+
+    struct CacheEntry {
+        Key key;
+        Value value;
+    };
+
+    using CacheListIterator = typename std::list<CacheEntry>::iterator;
+public:
+
+    QDltLruCache(size_t capacity) :
+        m_capacity(capacity) {
+    }
+
+    void put(const Key& key, const Value& value) {
+        auto it = m_keyIteratorsMap.find(key);
+        m_cacheItems.push_front(CacheEntry{key, value});
+        if (it != m_keyIteratorsMap.end()) {
+            m_cacheItems.erase(it->second);
+            m_keyIteratorsMap.erase(it);
+        }
+        m_keyIteratorsMap[key] = m_cacheItems.begin();
+
+        if (m_keyIteratorsMap.size() > m_capacity) {
+            auto last = std::prev(m_cacheItems.end());
+            m_keyIteratorsMap.erase(last->key);
+            m_cacheItems.pop_back();
+        }
+    }
+
+    const Value& get(const Key& key) {
+        auto it = m_keyIteratorsMap.find(key);
+        if (it == m_keyIteratorsMap.end()) {
+            throw std::range_error("no such key in cache found");
+        }
+
+        m_cacheItems.splice(m_cacheItems.begin(), m_cacheItems, it->second);
+        return it->second->value;
+    }
+
+    bool exists(const Key& key) const {
+        return m_keyIteratorsMap.find(key) != m_keyIteratorsMap.end();
+    }
+
+private:
+    std::list<CacheEntry> m_cacheItems;
+    std::unordered_map<Key, CacheListIterator> m_keyIteratorsMap;
+    const size_t m_capacity;
+};
+
+#endif // QDLTLRUCACHE_HPP