Cache rewriting fix (#9)

ExternPointer · web-flow · commit 1af909ac46c8 · 2023-05-19T04:07:13.000+03:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,7 +12,6 @@ file( GLOB_RECURSE IFC_HEADERS include/ifcpp/Ifc *.h )
 file( GLOB_RECURSE IFC_SOURCES src/Ifc *.cpp )
 
 set( SOURCES
-        src/Model/AttributeObject.cpp
         src/Model/BuildingGuid.cpp
         src/Model/BuildingModel.cpp
         src/Model/UnitConverter.cpp
diff --git a/include/ifcpp/Geometry/CurveConverter.h b/include/ifcpp/Geometry/CurveConverter.h
@@ -77,14 +77,18 @@ class CurveConverter {
     TCurve ConvertCurve( const std::shared_ptr<IfcCurve>& curve ) {
         // ENTITY IfcCurve ABSTRACT SUPERTYPE OF (ONEOF(IfcBoundedCurve, IfcConic, IfcLine, IfcOffsetCurve2D, IfcOffsetCurve3D, IfcPCurve))
 
+        TCurve* cached = nullptr;
         {
 #ifdef ENABLE_OPENMP
             ScopedLock lock( this->m_curveToPointsMapMutex );
 #endif
             if( this->m_curveToPointsMap.contains( curve ) ) {
-                return this->m_curveToPointsMap[ curve ];
+                cached = &this->m_curveToPointsMap[ curve ];
             }
         }
+        if( cached ) {
+            return *cached;
+        }
 
         TCurve result;
 
@@ -264,7 +268,9 @@ class CurveConverter {
 #ifdef ENABLE_OPENMP
             ScopedLock lock( this->m_curveToPointsMapMutex );
 #endif
-            this->m_curveToPointsMap[ curve ] = std::move( resultCopy );
+            if( !this->m_curveToPointsMap.contains( curve ) ) {
+                this->m_curveToPointsMap[ curve ] = std::move( resultCopy );
+            }
         }
         return result;
     }
diff --git a/include/ifcpp/Geometry/GeometryGenerator.h b/include/ifcpp/Geometry/GeometryGenerator.h
@@ -153,7 +153,7 @@ class GeometryGenerator {
             {
                 ScopedLock lock( entitiesPtrMutex );
                 Helpers::AppendTo( entitiesPtr, entitiesPerThread );
-            };
+            }
         }
 #endif
         return entities;
@@ -246,7 +246,9 @@ class GeometryGenerator {
 #ifdef ENABLE_OPENMP
             ScopedLock lock( this->m_representationToVisualObjectMapMutex );
 #endif
-            this->m_representationToVisualObjectMap[ representation ] = std::move( resultCopy );
+            if( !this->m_representationToVisualObjectMap.contains( representation ) ) {
+                this->m_representationToVisualObjectMap[ representation ] = std::move( resultCopy );
+            }
         }
         return visualObjects;
     }
@@ -294,7 +296,9 @@ class GeometryGenerator {
 #ifdef ENABLE_OPENMP
             ScopedLock lock( this->m_representationItemToVisualObjectMapMutex );
 #endif
-            this->m_representationItemToVisualObjectMap[ item ] = std::move( resultCopy );
+            if( !this->m_representationItemToVisualObjectMap.contains( item ) ) {
+                this->m_representationItemToVisualObjectMap[ item ] = std::move( resultCopy );
+            }
         }
         return visualObjects;
     }
diff --git a/include/ifcpp/Geometry/Helpers.h b/include/ifcpp/Geometry/Helpers.h
@@ -24,7 +24,7 @@ class Helpers {
     }
 
     template<CAdapter TAdapter>
-    static std::vector<typename TAdapter::TTriangle> CreateTriangles( const std::shared_ptr<TAdapter> adapter,
+    static std::vector<typename TAdapter::TTriangle> CreateTriangles( const std::shared_ptr<TAdapter>& adapter,
                                                                       const std::vector<std::vector<typename TAdapter::TVector>>& loops ) {
         std::vector<typename TAdapter::TTriangle> result;
         for( const auto& l: loops ) {
@@ -44,7 +44,7 @@ class Helpers {
     }
 
     template<CAdapter TAdapter>
-    static typename TAdapter::TMesh CreateMesh( const std::shared_ptr<TAdapter> adapter, const std::vector<std::vector<typename TAdapter::TVector>>& loops ) {
+    static typename TAdapter::TMesh CreateMesh( const std::shared_ptr<TAdapter>& adapter, const std::vector<std::vector<typename TAdapter::TVector>>& loops ) {
         return adapter->CreateMesh( Helpers::CreateTriangles( adapter, loops ) );
     }
 };
diff --git a/include/ifcpp/Geometry/ProfileConverter.h b/include/ifcpp/Geometry/ProfileConverter.h
@@ -77,14 +77,18 @@ class ProfileConverter {
         // ENTITY IfcProfileDef SUPERTYPE OF(ONEOF(IfcArbitraryClosedProfileDef, IfcArbitraryOpenProfileDef, IfcCompositeProfileDef, IfcDerivedProfileDef,
         // IfcParameterizedProfileDef));
 
+        std::vector<TVector>* cached = nullptr;
         {
 #ifdef ENABLE_OPENMP
             ScopedLock lock( this->m_profileToPointsMapMutex );
 #endif
             if( this->m_profileToPointsMap.contains( profile ) ) {
-                return this->m_profileToPointsMap[ profile ];
+                cached = &this->m_profileToPointsMap[ profile ];
             }
         }
+        if( cached ) {
+            return *cached;
+        }
 
         std::vector<TVector> result;
 
@@ -119,7 +123,9 @@ class ProfileConverter {
 #ifdef ENABLE_OPENMP
             ScopedLock lock( this->m_profileToPointsMapMutex );
 #endif
-            this->m_profileToPointsMap[ profile ] = std::move( resultCopy );
+            if( !this->m_profileToPointsMap.contains( profile ) ) {
+                this->m_profileToPointsMap[ profile ] = std::move( resultCopy );
+            }
         }
 
         return result;
diff --git a/include/ifcpp/Geometry/SolidConverter.h b/include/ifcpp/Geometry/SolidConverter.h
@@ -207,7 +207,9 @@ class SolidConverter {
 #ifdef ENABLE_OPENMP
             ScopedLock lock( this->m_booleanResultToVisualObjectMapMutex );
 #endif
-            this->m_booleanResultToVisualObjectMap[ booleanResult ] = std::move( resultCopy );
+            if( !this->m_booleanResultToVisualObjectMap.contains( booleanResult ) ) {
+                this->m_booleanResultToVisualObjectMap[ booleanResult ] = std::move( resultCopy );
+            }
         }
         return operand1;
     }
diff --git a/include/ifcpp/Geometry/StyleConverter.h b/include/ifcpp/Geometry/StyleConverter.h
@@ -112,14 +112,18 @@ class StyleConverter {
     std::vector<std::shared_ptr<Style>> ConvertPresentationStyle( const shared_ptr<IfcPresentationStyle>& presentationStyle ) {
         // ENTITY IfcPresentationStyle	ABSTRACT SUPERTYPE OF(ONEOF(IfcCurveStyle, IfcFillAreaStyle, IfcSurfaceStyle, IfcSymbolStyle, IfcTextStyle));
 
+        std::vector<std::shared_ptr<Style>>* cached = nullptr;
         {
 #ifdef ENABLE_OPENMP
             ScopedLock lock( this->m_presentationStyleToStylesMapMutex );
 #endif
             if( this->m_presentationStyleToStylesMap.contains( presentationStyle ) ) {
-                return this->m_presentationStyleToStylesMap[ presentationStyle ];
+                cached = &this->m_presentationStyleToStylesMap[ presentationStyle ];
             }
         }
+        if( cached ) {
+            return *cached;
+        }
 
         std::vector<std::shared_ptr<Style>> result;
 
@@ -145,11 +149,14 @@ class StyleConverter {
             result = {};
         }
 
+        auto resultCopy = result;
         {
 #ifdef ENABLE_OPENMP
             ScopedLock lock( this->m_presentationStyleToStylesMapMutex );
 #endif
-            this->m_presentationStyleToStylesMap[ presentationStyle ] = result;
+            if( !this->m_presentationStyleToStylesMap.contains( presentationStyle ) ) {
+                this->m_presentationStyleToStylesMap[ presentationStyle ] = std::move( resultCopy );
+            }
         }
 
 
diff --git a/src/Model/AttributeObject.cpp b/src/Model/AttributeObject.cpp

Original file line number	Diff line number	Diff line change
`@@ -77,14 +77,18 @@ class CurveConverter {`
`77`	`77`	`TCurve ConvertCurve( const std::shared_ptr<IfcCurve>& curve ) {`
`78`	`78`	`// ENTITY IfcCurve ABSTRACT SUPERTYPE OF (ONEOF(IfcBoundedCurve, IfcConic, IfcLine, IfcOffsetCurve2D, IfcOffsetCurve3D, IfcPCurve))`
`79`	`79`
	`80`	`+ TCurve* cached = nullptr;`
`80`	`81`	`{`
`81`	`82`	`#ifdef ENABLE_OPENMP`
`82`	`83`	`ScopedLock lock( this->m_curveToPointsMapMutex );`
`83`	`84`	`#endif`
`84`	`85`	`if( this->m_curveToPointsMap.contains( curve ) ) {`
`85`		`- return this->m_curveToPointsMap[ curve ];`
	`86`	`+ cached = &this->m_curveToPointsMap[ curve ];`
`86`	`87`	`}`
`87`	`88`	`}`
	`89`	`+ if( cached ) {`
	`90`	`+ return *cached;`
	`91`	`+ }`
`88`	`92`
`89`	`93`	`TCurve result;`
`90`	`94`
`@@ -264,7 +268,9 @@ class CurveConverter {`
`264`	`268`	`#ifdef ENABLE_OPENMP`
`265`	`269`	`ScopedLock lock( this->m_curveToPointsMapMutex );`
`266`	`270`	`#endif`
`267`		`- this->m_curveToPointsMap[ curve ] = std::move( resultCopy );`
	`271`	`+ if( !this->m_curveToPointsMap.contains( curve ) ) {`
	`272`	`+ this->m_curveToPointsMap[ curve ] = std::move( resultCopy );`
	`273`	`+ }`
`268`	`274`	`}`
`269`	`275`	`return result;`
`270`	`276`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ class GeometryGenerator {`
`153`	`153`	`{`
`154`	`154`	`ScopedLock lock( entitiesPtrMutex );`
`155`	`155`	`Helpers::AppendTo( entitiesPtr, entitiesPerThread );`
`156`		`- };`
	`156`	`+ }`
`157`	`157`	`}`
`158`	`158`	`#endif`
`159`	`159`	`return entities;`
`@@ -246,7 +246,9 @@ class GeometryGenerator {`
`246`	`246`	`#ifdef ENABLE_OPENMP`
`247`	`247`	`ScopedLock lock( this->m_representationToVisualObjectMapMutex );`
`248`	`248`	`#endif`
`249`		`- this->m_representationToVisualObjectMap[ representation ] = std::move( resultCopy );`
	`249`	`+ if( !this->m_representationToVisualObjectMap.contains( representation ) ) {`
	`250`	`+ this->m_representationToVisualObjectMap[ representation ] = std::move( resultCopy );`
	`251`	`+ }`
`250`	`252`	`}`
`251`	`253`	`return visualObjects;`
`252`	`254`	`}`
`@@ -294,7 +296,9 @@ class GeometryGenerator {`
`294`	`296`	`#ifdef ENABLE_OPENMP`
`295`	`297`	`ScopedLock lock( this->m_representationItemToVisualObjectMapMutex );`
`296`	`298`	`#endif`
`297`		`- this->m_representationItemToVisualObjectMap[ item ] = std::move( resultCopy );`
	`299`	`+ if( !this->m_representationItemToVisualObjectMap.contains( item ) ) {`
	`300`	`+ this->m_representationItemToVisualObjectMap[ item ] = std::move( resultCopy );`
	`301`	`+ }`
`298`	`302`	`}`
`299`	`303`	`return visualObjects;`
`300`	`304`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class Helpers {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`template<CAdapter TAdapter>`
`27`		`- static std::vector<typename TAdapter::TTriangle> CreateTriangles( const std::shared_ptr<TAdapter> adapter,`
	`27`	`+ static std::vector<typename TAdapter::TTriangle> CreateTriangles( const std::shared_ptr<TAdapter>& adapter,`
`28`	`28`	`const std::vector<std::vector<typename TAdapter::TVector>>& loops ) {`
`29`	`29`	`std::vector<typename TAdapter::TTriangle> result;`
`30`	`30`	`for( const auto& l: loops ) {`
`@@ -44,7 +44,7 @@ class Helpers {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`template<CAdapter TAdapter>`
`47`		`- static typename TAdapter::TMesh CreateMesh( const std::shared_ptr<TAdapter> adapter, const std::vector<std::vector<typename TAdapter::TVector>>& loops ) {`
	`47`	`+ static typename TAdapter::TMesh CreateMesh( const std::shared_ptr<TAdapter>& adapter, const std::vector<std::vector<typename TAdapter::TVector>>& loops ) {`
`48`	`48`	`return adapter->CreateMesh( Helpers::CreateTriangles( adapter, loops ) );`
`49`	`49`	`}`
`50`	`50`	`};`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,9 @@ class SolidConverter {`
`207`	`207`	`#ifdef ENABLE_OPENMP`
`208`	`208`	`ScopedLock lock( this->m_booleanResultToVisualObjectMapMutex );`
`209`	`209`	`#endif`
`210`		`- this->m_booleanResultToVisualObjectMap[ booleanResult ] = std::move( resultCopy );`
	`210`	`+ if( !this->m_booleanResultToVisualObjectMap.contains( booleanResult ) ) {`
	`211`	`+ this->m_booleanResultToVisualObjectMap[ booleanResult ] = std::move( resultCopy );`
	`212`	`+ }`
`211`	`213`	`}`
`212`	`214`	`return operand1;`
`213`	`215`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,14 +112,18 @@ class StyleConverter {`
`112`	`112`	`std::vector<std::shared_ptr<Style>> ConvertPresentationStyle( const shared_ptr<IfcPresentationStyle>& presentationStyle ) {`
`113`	`113`	`// ENTITY IfcPresentationStyle ABSTRACT SUPERTYPE OF(ONEOF(IfcCurveStyle, IfcFillAreaStyle, IfcSurfaceStyle, IfcSymbolStyle, IfcTextStyle));`
`114`	`114`
	`115`	`+ std::vector<std::shared_ptr<Style>>* cached = nullptr;`
`115`	`116`	`{`
`116`	`117`	`#ifdef ENABLE_OPENMP`
`117`	`118`	`ScopedLock lock( this->m_presentationStyleToStylesMapMutex );`
`118`	`119`	`#endif`
`119`	`120`	`if( this->m_presentationStyleToStylesMap.contains( presentationStyle ) ) {`
`120`		`- return this->m_presentationStyleToStylesMap[ presentationStyle ];`
	`121`	`+ cached = &this->m_presentationStyleToStylesMap[ presentationStyle ];`
`121`	`122`	`}`
`122`	`123`	`}`
	`124`	`+ if( cached ) {`
	`125`	`+ return *cached;`
	`126`	`+ }`
`123`	`127`
`124`	`128`	`std::vector<std::shared_ptr<Style>> result;`
`125`	`129`
`@@ -145,11 +149,14 @@ class StyleConverter {`
`145`	`149`	`result = {};`
`146`	`150`	`}`
`147`	`151`
	`152`	`+ auto resultCopy = result;`
`148`	`153`	`{`
`149`	`154`	`#ifdef ENABLE_OPENMP`
`150`	`155`	`ScopedLock lock( this->m_presentationStyleToStylesMapMutex );`
`151`	`156`	`#endif`
`152`		`- this->m_presentationStyleToStylesMap[ presentationStyle ] = result;`
	`157`	`+ if( !this->m_presentationStyleToStylesMap.contains( presentationStyle ) ) {`
	`158`	`+ this->m_presentationStyleToStylesMap[ presentationStyle ] = std::move( resultCopy );`
	`159`	`+ }`
`153`	`160`	`}`
`154`	`161`
`155`	`162`