use more appropriate container for error list

danmar · Jul 31, 2023 · bcb2f12 · bcb2f12
1 parent daa8543
commit bcb2f12
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/cli/executor.cpp b/cli/executor.cpp
@@ -48,8 +48,7 @@ bool Executor::hasToLog(const ErrorMessage &msg)
             return false;
 
         std::lock_guard<std::mutex> lg(mErrorListSync);
-        if (std::find(mErrorList.cbegin(), mErrorList.cend(), errmsg) == mErrorList.cend()) {
-            mErrorList.emplace_back(std::move(errmsg));
+        if (mErrorList.emplace(std::move(errmsg)).second) {
             return true;
         }
     }

diff --git a/cli/executor.h b/cli/executor.h
@@ -20,10 +20,10 @@
 #define EXECUTOR_H
 
 #include <cstddef>
-#include <list>
 #include <map>
 #include <mutex>
 #include <string>
+#include <unordered_set>
 
 class Settings;
 class ErrorLogger;
@@ -71,7 +71,7 @@ class Executor {
 private:
     std::mutex mErrorListSync;
     // TODO: store hashes instead of full messages
-    std::list<std::string> mErrorList;
+    std::unordered_set<std::string> mErrorList;
 };
 
 /// @}

diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
@@ -1603,7 +1603,7 @@ void CppCheck::reportErr(const ErrorMessage &msg)
         return;
 
     // Alert only about unique errors
-    if (std::find(mErrorList.cbegin(), mErrorList.cend(), errmsg) != mErrorList.cend())
+    if (!mErrorList.emplace(std::move(errmsg)).second)
         return;
 
     if (!mSettings.buildDir.empty())
@@ -1613,8 +1613,6 @@ void CppCheck::reportErr(const ErrorMessage &msg)
         mExitCode = 1;
     }
 
-    mErrorList.emplace_back(std::move(errmsg));
-
     mErrorLogger.reportErr(msg);
     // check if plistOutput should be populated and the current output file is open and the error is not suppressed
     if (!mSettings.plistOutput.empty() && mPlistFile.is_open() && !mSettings.nomsg.isSuppressed(errorMessage)) {

diff --git a/lib/cppcheck.h b/lib/cppcheck.h
@@ -35,6 +35,7 @@
 #include <list>
 #include <map>
 #include <string>
+#include <unordered_set>
 #include <vector>
 
 class Tokenizer;
@@ -208,7 +209,7 @@ class CPPCHECKLIB CppCheck : ErrorLogger {
     void reportOut(const std::string &outmsg, Color c = Color::Reset) override;
 
     // TODO: store hashes instead of the full messages
-    std::list<std::string> mErrorList;
+    std::unordered_set<std::string> mErrorList;
     Settings mSettings;
 
     void reportProgress(const std::string &filename, const char stage[], const std::size_t value) override;