Fixed crashes random crashes in multithreading caused by useless creation of CheckUnusedFunctions instance per thread.

PKEuS · PKEuS · commit 9bfc2b618b8c · 2014-04-13T11:56:38.000+02:00
diff --git a/lib/checkunusedfunctions.cpp b/lib/checkunusedfunctions.cpp
@@ -27,6 +27,9 @@
 
 
 
+// Register this check class
+CheckUnusedFunctions CheckUnusedFunctions::instance;
+
 
 //---------------------------------------------------------------------------
 // FUNCTION USAGE - Check for unused functions etc
diff --git a/lib/checkunusedfunctions.h b/lib/checkunusedfunctions.h
@@ -31,7 +31,7 @@
 /** @brief Check for functions never called */
 /// @{
 
-class CPPCHECKLIB CheckUnusedFunctions: public Check {
+class CPPCHECKLIB CheckUnusedFunctions : public Check {
 public:
     /** @brief This constructor is used when registering the CheckUnusedFunctions */
     CheckUnusedFunctions() : Check(myName()) {
@@ -49,6 +49,8 @@ class CPPCHECKLIB CheckUnusedFunctions: public Check {
 
     void check(ErrorLogger * const errorLogger);
 
+    static CheckUnusedFunctions instance;
+
 private:
 
     void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const {
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
@@ -282,7 +282,7 @@ void CppCheck::checkFunctionUsage()
         if (_settings._errorsOnly == false)
             _errorLogger.reportOut("Checking usage of global functions..");
 
-        _checkUnusedFunctions.check(this);
+        CheckUnusedFunctions::instance.check(this);
 
         _settings._verbose = verbose_orig;
     }
@@ -359,7 +359,7 @@ void CppCheck::checkFile(const std::string &code, const char FileName[])
         }
 
         // call all "runChecks" in all registered Check classes
-        for (std::list<Check *>::iterator it = Check::instances().begin(); it != Check::instances().end(); ++it) {
+        for (std::list<Check *>::const_iterator it = Check::instances().begin(); it != Check::instances().end(); ++it) {
             if (_settings.terminated())
                 return;
 
@@ -368,7 +368,7 @@ void CppCheck::checkFile(const std::string &code, const char FileName[])
         }
 
         if (_settings.isEnabled("unusedFunction") && _settings._jobs == 1)
-            _checkUnusedFunctions.parseTokens(_tokenizer, FileName, &_settings);
+            CheckUnusedFunctions::instance.parseTokens(_tokenizer, FileName, &_settings);
 
         executeRules("normal", _tokenizer);
 
@@ -382,7 +382,7 @@ void CppCheck::checkFile(const std::string &code, const char FileName[])
             return;
 
         // call all "runSimplifiedChecks" in all registered Check classes
-        for (std::list<Check *>::iterator it = Check::instances().begin(); it != Check::instances().end(); ++it) {
+        for (std::list<Check *>::const_iterator it = Check::instances().begin(); it != Check::instances().end(); ++it) {
             if (_settings.terminated())
                 return;
 
@@ -638,7 +638,7 @@ void CppCheck::getErrorMessages()
     tooManyConfigsError("",0U);
 
     // call all "getErrorMessages" in all registered Check classes
-    for (std::list<Check *>::iterator it = Check::instances().begin(); it != Check::instances().end(); ++it)
+    for (std::list<Check *>::const_iterator it = Check::instances().begin(); it != Check::instances().end(); ++it)
         (*it)->getErrorMessages(this, &_settings);
 
     Tokenizer::getErrorMessages(this, &_settings);
diff --git a/lib/cppcheck.h b/lib/cppcheck.h
@@ -194,7 +194,6 @@ class CPPCHECKLIB CppCheck : ErrorLogger {
      */
     virtual void reportInfo(const ErrorLogger::ErrorMessage &msg);
 
-    CheckUnusedFunctions _checkUnusedFunctions;
     ErrorLogger &_errorLogger;
 
     /** @brief Current preprocessor configuration */
diff --git a/test/testthreadexecutor.cpp b/test/testthreadexecutor.cpp
@@ -65,6 +65,7 @@ class TestThreadExecutor : public TestFixture {
 
     void run() {
         TEST_CASE(deadlock_with_many_errors);
+        TEST_CASE(many_threads);
         TEST_CASE(no_errors_more_files);
         TEST_CASE(no_errors_less_files);
         TEST_CASE(no_errors_equal_amount_files);
@@ -84,6 +85,16 @@ class TestThreadExecutor : public TestFixture {
         check(2, 3, 3, oss.str());
     }
 
+    void many_threads() {
+        std::ostringstream oss;
+        oss << "int main()\n"
+            << "{\n";
+        oss << "  char *a = malloc(10);\n";
+        oss << "  return 0;\n"
+            << "}";
+        check(20, 100, 100, oss.str());
+    }
+
     void no_errors_more_files() {
         std::ostringstream oss;
         oss << "int main()\n"
