Surface: replace std::mutex with a boolean to avoid extra overhead

FreeCAD · Jul 3, 2020 · 9f84186 · 9f84186
1 parent 74ad645
commit 9f84186
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/Mod/Surface/App/FeatureExtend.cpp b/src/Mod/Surface/App/FeatureExtend.cpp
@@ -46,7 +46,7 @@ const App::PropertyFloatConstraint::Constraints ToleranceRange = {0.0,10.0,0.01}
 const App::PropertyFloatConstraint::Constraints ExtendRange = {-0.5,10.0,0.01};
 PROPERTY_SOURCE(Surface::Extend, Part::Spline)
 
-Extend::Extend()
+Extend::Extend() : lockOnChangeMutex(false)
 {
     ADD_PROPERTY(Face,(0));
     Face.setScope(App::LinkScope::Global);
@@ -157,9 +157,9 @@ App::DocumentObjectExecReturn *Extend::execute(void)
 void Extend::onChanged(const App::Property* prop)
 {
     // using a mutex and lock to protect a recursive calling when setting the new values
-    if (!lockOnChangeMutex.try_lock()) return;
-    lockOnChangeMutex.unlock();
-    std::lock_guard<std::mutex> lock(lockOnChangeMutex);
+    if (lockOnChangeMutex)
+        return;
+    Base::StateLocker lock(lockOnChangeMutex);
 
     if (ExtendUSymetric.getValue())
     {

diff --git a/src/Mod/Surface/App/FeatureExtend.h b/src/Mod/Surface/App/FeatureExtend.h
@@ -28,8 +28,6 @@
 #include <App/PropertyLinks.h>
 #include <Mod/Part/App/FeaturePartSpline.h>
 
-#include <mutex>
-
 namespace Surface
 {
 
@@ -51,7 +49,6 @@ class SurfaceExport Extend :  public Part::Spline
     App::PropertyBool            ExtendVSymetric;
     App::PropertyIntegerConstraint SampleU;
     App::PropertyIntegerConstraint SampleV;
-    std::mutex lockOnChangeMutex;
 
     // recalculate the feature
     App::DocumentObjectExecReturn *execute(void) override;
@@ -62,6 +59,9 @@ class SurfaceExport Extend :  public Part::Spline
     virtual void handleChangedPropertyName(Base::XMLReader &reader,
                                            const char * TypeName,
                                            const char *PropName) override;
+
+private:
+    bool lockOnChangeMutex;
 };
 
 }//Namespace Surface