Multicore cpu support for Linux (currently disabled and compiling produces warnings)

aggro80 · aggro80 · commit 4fc774dedab7 · 2009-02-19T22:21:18.000Z
"no errors" output removed.
diff --git a/Makefile b/Makefile
@@ -20,6 +20,7 @@ OBJECTS =     src/checkbufferoverrun.o \
               src/main.o \
               src/preprocessor.o \
               src/settings.o \
+              src/threadexecutor.o \
               src/token.o \
               src/tokenize.o
 
@@ -62,6 +63,7 @@ TESTOBJ =     test/testbufferoverrun.o \
               src/filelister.o \
               src/preprocessor.o \
               src/settings.o \
+              src/threadexecutor.o \
               src/token.o \
               src/tokenize.o
 
@@ -127,7 +129,7 @@ src/checkvalidate.o: src/checkvalidate.cpp src/checkvalidate.h src/errorlogger.h
 src/cppcheck.o: src/cppcheck.cpp src/cppcheck.h src/settings.h src/errorlogger.h src/checkfunctionusage.h src/tokenize.h src/token.h src/preprocessor.h src/checkmemoryleak.h src/checkbufferoverrun.h src/checkdangerousfunctions.h src/checkclass.h src/checkheaders.h src/checkother.h src/checkstl.h src/filelister.h
 	g++ $(CXXFLAGS) -c -o src/cppcheck.o src/cppcheck.cpp
 
-src/cppcheckexecutor.o: src/cppcheckexecutor.cpp src/cppcheckexecutor.h src/errorlogger.h src/settings.h src/cppcheck.h src/checkfunctionusage.h src/tokenize.h src/token.h
+src/cppcheckexecutor.o: src/cppcheckexecutor.cpp src/cppcheckexecutor.h src/errorlogger.h src/settings.h src/cppcheck.h src/checkfunctionusage.h src/tokenize.h src/token.h src/threadexecutor.h
 	g++ $(CXXFLAGS) -c -o src/cppcheckexecutor.o src/cppcheckexecutor.cpp
 
 src/errorlogger.o: src/errorlogger.cpp src/errorlogger.h src/settings.h src/tokenize.h src/token.h
@@ -145,6 +147,9 @@ src/preprocessor.o: src/preprocessor.cpp src/preprocessor.h src/tokenize.h src/s
 src/settings.o: src/settings.cpp src/settings.h
 	g++ $(CXXFLAGS) -c -o src/settings.o src/settings.cpp
 
+src/threadexecutor.o: src/threadexecutor.cpp src/threadexecutor.h src/settings.h src/errorlogger.h src/cppcheck.h src/checkfunctionusage.h src/tokenize.h src/token.h
+	g++ $(CXXFLAGS) -c -o src/threadexecutor.o src/threadexecutor.cpp
+
 src/token.o: src/token.cpp src/token.h
 	g++ $(CXXFLAGS) -c -o src/token.o src/token.cpp
 
diff --git a/cppcheck.cbp b/cppcheck.cbp
@@ -59,6 +59,8 @@
 		<Unit filename="src/preprocessor.h" />
 		<Unit filename="src/settings.cpp" />
 		<Unit filename="src/settings.h" />
+		<Unit filename="src/threadexecutor.cpp" />
+		<Unit filename="src/threadexecutor.h" />
 		<Unit filename="src/token.cpp" />
 		<Unit filename="src/token.h" />
 		<Unit filename="src/tokenize.cpp" />
diff --git a/src/cppcheck.cpp b/src/cppcheck.cpp
@@ -262,16 +262,7 @@ unsigned int CppCheck::check()
             ++checkCount;
         }
 
-        if (_settings._errorsOnly == false && _errout.str().empty())
-        {
-            std::ostringstream oss;
-            oss << "No errors found ("
-            << (c + 1) << "/" << _filenames.size()
-            << " files checked " <<
-            static_cast<int>(static_cast<double>((c + 1)) / _filenames.size()*100)
-            << "% done)";
-            _errorLogger->reportOut(oss.str());
-        }
+        _errorLogger->reportStatus(c + 1, _filenames.size());
     }
 
     // This generates false positives - especially for libraries
@@ -458,3 +449,13 @@ void CppCheck::reportOut(const std::string & /*outmsg*/)
     // This is currently never called. It is here just to comply with
     // the interface.
 }
+
+const std::vector<std::string> &CppCheck::filenames() const
+{
+    return _filenames;
+}
+
+void CppCheck::reportStatus(unsigned int /*index*/, unsigned int /*max*/)
+{
+
+}
diff --git a/src/cppcheck.h b/src/cppcheck.h
@@ -100,6 +100,10 @@ class CppCheck : public ErrorLogger
      */
     std::string parseFromArgs(int argc, const char* const argv[]);
 
+    const std::vector<std::string> &filenames() const;
+
+    virtual void reportStatus(unsigned int index, unsigned int max);
+
 private:
     void checkFile(const std::string &code, const char FileName[]);
 
diff --git a/src/cppcheckexecutor.cpp b/src/cppcheckexecutor.cpp
@@ -19,17 +19,18 @@
 
 #include "cppcheckexecutor.h"
 #include "cppcheck.h"
+#include "threadexecutor.h"
 #include <fstream>
 #include <iostream>
 
 CppCheckExecutor::CppCheckExecutor()
 {
-    _useXML = false;
+
 }
 
 CppCheckExecutor::~CppCheckExecutor()
 {
-    //dtor
+
 }
 
 unsigned int CppCheckExecutor::check(int argc, const char* const argv[])
@@ -38,15 +39,29 @@ unsigned int CppCheckExecutor::check(int argc, const char* const argv[])
     std::string result = cppCheck.parseFromArgs(argc, argv);
     if (result.length() == 0)
     {
-        if (cppCheck.settings()._xml)
+        _settings = cppCheck.settings();
+        if (_settings._xml)
         {
-            _useXML = true;
             reportErr("<?xml version=\"1.0\"?>");
             reportErr("<results>");
         }
 
-        unsigned int returnValue = cppCheck.check();
-        if (_useXML)
+        unsigned int returnValue = 0;
+        if (1)
+        {
+            // Single process
+            returnValue = cppCheck.check();
+        }
+        else
+        {
+            // Multiple processes
+            const std::vector<std::string> &filenames = cppCheck.filenames();
+            Settings settings = cppCheck.settings();
+            ThreadExecutor executor(filenames, settings, *this);
+            returnValue = executor.check();
+        }
+
+        if (_settings._xml)
         {
             reportErr("</results>");
         }
@@ -70,9 +85,22 @@ void CppCheckExecutor::reportOut(const std::string &outmsg)
     std::cout << outmsg << std::endl;
 }
 
+void CppCheckExecutor::reportStatus(unsigned int index, unsigned int max)
+{
+    if (max > 1 && !_settings._errorsOnly)
+    {
+        std::ostringstream oss;
+        oss << index << "/" << max
+        << " files checked " <<
+        static_cast<int>(static_cast<double>(index) / max*100)
+        << "% done";
+        std::cout << oss.str() << std::endl;
+    }
+}
+
 void CppCheckExecutor::reportErr(const ErrorLogger::ErrorMessage &msg)
 {
-    if (_useXML)
+    if (_settings._xml)
     {
         reportErr(msg.toXML());
     }
diff --git a/src/cppcheckexecutor.h b/src/cppcheckexecutor.h
@@ -21,6 +21,7 @@
 #define CPPCHECKEXECUTOR_H
 
 #include "errorlogger.h"
+#include "settings.h"
 
 /**
  * This class works as an example of how CppCheck can be used in external
@@ -67,6 +68,8 @@ class CppCheckExecutor : public ErrorLogger
     /** xml output of errors */
     virtual void reportErr(const ErrorLogger::ErrorMessage &msg);
 
+    virtual void reportStatus(unsigned int index, unsigned int max);
+
 private:
 
     /**
@@ -75,7 +78,7 @@ class CppCheckExecutor : public ErrorLogger
      */
     void reportErr(const std::string &errmsg);
 
-    bool _useXML;
+    Settings _settings;
 };
 
 #endif // CPPCHECKEXECUTOR_H
diff --git a/src/errorlogger.cpp b/src/errorlogger.cpp
@@ -23,6 +23,11 @@
 
 #include <sstream>
 
+ErrorLogger::ErrorMessage::ErrorMessage()
+{
+
+}
+#include <iostream>
 ErrorLogger::ErrorMessage::ErrorMessage(const std::list<FileLocation> &callStack, const std::string &severity, const std::string &msg, const std::string &id)
 {
     _callStack = callStack;
@@ -31,6 +36,78 @@ ErrorLogger::ErrorMessage::ErrorMessage(const std::list<FileLocation> &callStack
     _id = id;
 }
 
+std::string ErrorLogger::ErrorMessage::serialize() const
+{
+    std::ostringstream oss;
+    oss << _id.length() << " " << _id;
+    oss << _severity.length() << " " << _severity;
+    oss << _msg.length() << " " << _msg;
+    oss << _callStack.size() << " ";
+
+    for (std::list<ErrorLogger::ErrorMessage::FileLocation>::const_iterator tok = _callStack.begin(); tok != _callStack.end(); ++tok)
+    {
+        std::ostringstream smallStream;
+        smallStream << (*tok).line << ":" << (*tok).file;
+        oss << smallStream.str().length() << " " << smallStream.str();
+    }
+    return oss.str();
+}
+
+bool ErrorLogger::ErrorMessage::deserialize(const std::string &data)
+{
+    _callStack.clear();
+    std::istringstream iss(data);
+    std::vector<std::string> results;
+    while (iss.good())
+    {
+        unsigned int len = 0;
+        if (!(iss >> len))
+            return false;
+
+        iss.get();
+        std::string temp;
+        for (unsigned int i = 0; i < len && iss.good(); ++i)
+            temp.append(1, iss.get());
+
+        results.push_back(temp);
+        if (results.size() == 3)
+            break;
+    }
+
+    _id = results[0];
+    _severity = results[1];
+    _msg = results[2];
+
+    unsigned int stackSize = 0;
+    if (!(iss >> stackSize))
+        return false;
+
+    while (iss.good())
+    {
+        unsigned int len = 0;
+        if (!(iss >> len))
+            return false;
+
+        iss.get();
+        std::string temp;
+        for (unsigned int i = 0; i < len && iss.good(); ++i)
+            temp.append(1, iss.get());
+
+        ErrorLogger::ErrorMessage::FileLocation loc;
+        loc.file = temp.substr(temp.find(':') + 1);
+        temp = temp.substr(0, temp.find(':'));
+        std::istringstream fiss(temp);
+        fiss >> loc.line;
+
+        _callStack.push_back(loc);
+
+        if (_callStack.size() >= stackSize)
+            break;
+    }
+
+    return true;
+}
+
 std::string ErrorLogger::ErrorMessage::toXML() const
 {
     std::ostringstream xml;
diff --git a/src/errorlogger.h b/src/errorlogger.h
@@ -52,8 +52,11 @@ class ErrorLogger
         };
 
         ErrorMessage(const std::list<FileLocation> &callStack, const std::string &severity, const std::string &msg, const std::string &id);
+        ErrorMessage();
         std::string toXML() const;
         std::string toText() const;
+        std::string serialize() const;
+        bool deserialize( const std::string &data );
     private:
         std::list<FileLocation> _callStack;
         std::string _severity;
@@ -81,6 +84,14 @@ class ErrorLogger
      */
     virtual void reportErr(const ErrorLogger::ErrorMessage &msg) = 0;
 
+    /**
+     * Information about how many files have been checked
+     *
+     * @param index This many files have been checked.
+     * @param max This many files there are in total.
+     */
+    virtual void reportStatus(unsigned int index, unsigned int max) = 0;
+
     void arrayIndexOutOfBounds(const Tokenizer *tokenizer, const std::list<const Token *> &Location)
     {
         _writemsg(tokenizer, Location, "all", "Array index out of bounds", "arrayIndexOutOfBounds");
diff --git a/src/threadexecutor.cpp b/src/threadexecutor.cpp
diff --git a/src/threadexecutor.h b/src/threadexecutor.h
diff --git a/test/testsuite.h b/test/testsuite.h
diff --git a/tools/errmsg.cpp b/tools/errmsg.cpp
