Refs #10330. ThreadPool should no longer depend on openmp

mantidproject · Oct 14, 2014 · 66365f3 · 66365f3
1 parent e189c59
commit 66365f3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/ThreadSafeLogStream.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/ThreadSafeLogStream.h
@@ -19,6 +19,7 @@
 
 #include <istream>
 #include <Poco/Thread.h>
+#include <Poco/Mutex.h>
 
 namespace Mantid 
 {
@@ -73,6 +74,8 @@ class MANTID_KERNEL_DLL ThreadSafeLogStreamBuf: public Poco::LogStreamBuf
 private:
   /// Store a map of thread indices to messages
   std::map<Poco::Thread::TID, std::string> m_messages;
+  /// mutex protecting logstream
+  Poco::Mutex m_mutex;
 };
 
 

diff --git a/Code/Mantid/Framework/Kernel/src/ThreadPool.cpp b/Code/Mantid/Framework/Kernel/src/ThreadPool.cpp
@@ -1,7 +1,6 @@
 //----------------------------------------------------------------------
 // Includes
 //----------------------------------------------------------------------
-#include "MantidKernel/MultiThreaded.h"
 #include "MantidKernel/ThreadPool.h"
 #include "MantidKernel/ThreadPoolRunnable.h"
 #include "MantidKernel/Task.h"
@@ -12,6 +11,7 @@
 #include <Poco/Mutex.h>
 #include <Poco/Runnable.h>
 #include <Poco/Thread.h>
+#include <Poco/Environment.h>
 
 namespace Mantid
 {
@@ -39,7 +39,7 @@ namespace Kernel
     if (numThreads == 0)
     {
       //Uses OpenMP to find how many cores there are.
-      m_numThreads = PARALLEL_GET_MAX_THREADS;
+      m_numThreads = getNumPhysicalCores();
     }
     else
       m_numThreads = numThreads;
@@ -60,16 +60,14 @@ namespace Kernel
 
   //--------------------------------------------------------------------------------
   /** Return the number of physical cores available on the system.
-   * NOTE: Uses OpenMP getMaxThreads to find the number.
-   * @return how many cores are present. 1 if no OpenMP is installed.
+   * NOTE: Uses Poco::Environment::processorCount() to find the number.
+   * @return how many cores are present.
    */
   size_t ThreadPool::getNumPhysicalCores()
   {
-    return PARALLEL_GET_MAX_THREADS;
+      return  Poco::Environment::processorCount();
   }
 
-
-
   //--------------------------------------------------------------------------------
   /** Start the threads and begin looking for tasks.
    *

diff --git a/Code/Mantid/Framework/Kernel/src/ThreadSafeLogStream.cpp b/Code/Mantid/Framework/Kernel/src/ThreadSafeLogStream.cpp
@@ -48,10 +48,8 @@ int ThreadSafeLogStreamBuf::writeToDevice(char c)
   }
   else 
   {
-    PARALLEL_CRITICAL(logstream)
-    {
-      m_messages[Poco::Thread::currentTid()] += c;
-    }
+    Poco::Mutex::ScopedLock lock(m_mutex);
+    m_messages[Poco::Thread::currentTid()] += c;
   }
   return static_cast<int>(c);
 }