Merge pull request #63 from dzenanz/master

ENH: switch from ITK's mutex wrapper to std::mutex

Author: dzenanz

src/PerformanceBenchmarkingInformation.cxx.in

@@ -21,9 +21,6 @@
 #include "PerformanceBenchmarkingUtilities.h"
 #include "PerformanceBenchmarkingInformation.h"
 
-
-#include "itkSimpleFastMutexLock.h"
-#include "itkMutexLockHolder.h"
 #include "itkObjectFactory.h"
 
 #include <ostream>
@@ -44,7 +41,7 @@ m_Map.emplace(
 
 namespace itk {
 
-SimpleFastMutexLock PerformanceBenchmarkingInformation::m_Mutex;
+std::mutex PerformanceBenchmarkingInformation::m_Mutex;
 PerformanceBenchmarkingInformation::Pointer PerformanceBenchmarkingInformation::m_InformationInstance;
 PerformanceBenchmarkingInformation::MapType PerformanceBenchmarkingInformation::m_Map;
 
@@ -59,7 +56,7 @@ PerformanceBenchmarkingInformation::Pointer
 PerformanceBenchmarkingInformation
 ::GetInstance()
 {
-  MutexLockHolder<SimpleFastMutexLock> mutexHolder(m_Mutex);
+  std::lock_guard<std::mutex> mutexHolder(m_Mutex);
   if (m_InformationInstance.IsNull())
   {
     m_InformationInstance = ObjectFactory<Self>::Create();
@@ -117,11 +114,10 @@ PerformanceBenchmarkingInformation::GetAllKeys()
 PerformanceBenchmarkingInformation
 ::PerformanceBenchmarkingInformation()
 {
-  MutexLockHolder<SimpleFastMutexLock> mutexHolder(m_Mutex);
   m_InformationInstance = this; //threads need this
   m_InformationInstance->UnRegister(); // Remove extra reference
 
   @MAPPING_VALUES@
 }
 
-} //end namespace itk
+} //end namespace itk

src/PerformanceBenchmarkingInformation.h.in

@@ -20,7 +20,7 @@
 
 #include "itkMacro.h"
 #include "itkObject.h"
-#include "itkSimpleFastMutexLock.h"
+#include <mutex>
 
 // A configure time introspection for
 #cmakedefine ITK_HAS_INFORMATION_H
@@ -100,9 +100,9 @@ private:
   PerformanceBenchmarkingInformation();
 
   /** To lock on the internal variables */
-  static SimpleFastMutexLock m_Mutex;
-  static Pointer             m_InformationInstance;
-  static MapType             m_Map;
+  static std::mutex m_Mutex;
+  static Pointer    m_InformationInstance;
+  static MapType    m_Map;
 };  // end of class
 
 } // end namespace itk

test/Docker/Dockerfile

@@ -28,8 +28,8 @@ RUN mkdir -p /ITKPerformanceBenchmarking-build && \
   mkdir -p /ITKBenchmarks-build
 WORKDIR /
 
-# ITK master 2018-02-22
-ENV ITK_GIT_TAG 4b1e6c03f1f9f07f2d97521103d5f438eef95d52
+# ITK master 2018-10-23
+ENV ITK_GIT_TAG 82ab8bde7679ca21559933356f193a78a1d47848
 RUN git clone https://github.com/InsightSoftwareConsortium/ITK.git && \
   cd ITK && \
   git checkout ${ITK_GIT_TAG} && \
@@ -46,6 +46,7 @@ RUN git clone https://github.com/InsightSoftwareConsortium/ITK.git && \
     -DITK_LEGACY_REMOVE:BOOL=ON \
     -DITK_BUILD_DEFAULT_MODULES:BOOL=OFF \
     -DITK_USE_SYSTEM_LIBRARIES:BOOL=ON \
+    -DITK_USE_SYSTEM_HDF5:BOOL=OFF \
     -DModule_ITKTestKernel:BOOL=ON \
     -DModule_ITKIOImageBase:BOOL=ON \
     -DModule_ITKIOMeta:BOOL=ON \
@@ -62,7 +63,7 @@ RUN git clone https://github.com/InsightSoftwareConsortium/ITK.git && \
     -DModule_ITKRegionGrowing:BOOL=ON \
     -DModule_ITKWatersheds:BOOL=ON \
     -DModule_ITKConnectedComponents:BOOL=ON \
-    -DModule_ITKAnisotropicDiffusion:BOOL=ON \
+    -DModule_ITKAnisotropicSmoothing:BOOL=ON \
     -DModule_ITKFastMarching:BOOL=ON \
     -DModule_ITKLevelSets:BOOL=ON \
   ../ITK && \