ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-02-10 04:23:07 +05:00
Code Issues Packages Projects Releases Wiki Activity

Moving creation/deletion of temporary folder as __del__ is not called (Unregister removed from smeshBuilder)

Browse Source
This commit is contained in:
Yoann Audouin 2022-11-04 15:20:53 +01:00
parent 3fb90fec5e
commit e749ba3f4e
3 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SMESH/SMESH_Gen.cxx
View File

@ -289,6 +289,7 @@ bool SMESH_Gen::parallelComputeSubMeshes(
// Pool of thread for computation // Pool of thread for computation
// TODO: move when parallelMesh created // TODO: move when parallelMesh created
aMesh.InitPoolThreads(); aMesh.InitPoolThreads();
aMesh.CreateTmpFolder();
TopAbs_ShapeEnum previousShapeType = TopAbs_VERTEX; TopAbs_ShapeEnum previousShapeType = TopAbs_VERTEX;
int nbThreads = aMesh.GetNbThreads(); int nbThreads = aMesh.GetNbThreads();
@ -365,6 +366,7 @@ bool SMESH_Gen::parallelComputeSubMeshes(
aMesh.wait(); aMesh.wait();
aMesh.GetMeshDS()->Modified(); aMesh.GetMeshDS()->Modified();
aMesh.DeleteTmpFolder();
return ret; return ret;
}; };

31
src/SMESH/SMESH_Mesh.cxx
View File

@ -124,9 +124,6 @@ SMESH_Mesh::SMESH_Mesh(int theLocalId,
_callUp = NULL; _callUp = NULL;
_meshDS->ShapeToMesh( PseudoShape() ); _meshDS->ShapeToMesh( PseudoShape() );
_subMeshHolder = new SubMeshHolder; _subMeshHolder = new SubMeshHolder;
// Temporary folder that will be used by parallel computation
tmp_folder = fs::temp_directory_path()/fs::unique_path(fs::path("SMESH_%%%%-%%%%"));
fs::create_directories(tmp_folder);
// assure unique persistent ID // assure unique persistent ID
if ( _document->NbMeshes() > 1 ) if ( _document->NbMeshes() > 1 )
@ -243,9 +240,6 @@ SMESH_Mesh::~SMESH_Mesh()
if(_pool) if(_pool)
DeletePoolThreads(); DeletePoolThreads();
#endif #endif
#ifndef _DEBUG_
fs::remove_all(tmp_folder);
#endif
} }
//================================================================================ //================================================================================
@ -2575,3 +2569,28 @@ void SMESH_Mesh::getAncestorsSubMeshes (const TopoDS_Shape& theSubSha
// sort submeshes according to stored mesh order // sort submeshes according to stored mesh order
SortByMeshOrder( theSubMeshes ); SortByMeshOrder( theSubMeshes );
} }
//=============================================================================
/*!
* \brief Build folder for parallel computation
*/
//=============================================================================
void SMESH_Mesh::CreateTmpFolder()
{
// Temporary folder that will be used by parallel computation
tmp_folder = fs::temp_directory_path()/fs::unique_path(fs::path("SMESH_%%%%-%%%%"));
fs::create_directories(tmp_folder);
}
//
//=============================================================================
/*!
* \brief Delete temporary folder used for parallel computation
*/
//=============================================================================
void SMESH_Mesh::DeleteTmpFolder()
{
#ifndef _DEBUG_
fs::remove_all(tmp_folder);
#endif
}

3
src/SMESH/SMESH_Mesh.hxx
View File

@ -418,6 +418,9 @@ class SMESH_EXPORT SMESH_Mesh
bool IsParallel(){return _NbThreads > 0;} bool IsParallel(){return _NbThreads > 0;}
#endif #endif
void CreateTmpFolder();
void DeleteTmpFolder();
// Temporary folder used during parallel Computation // Temporary folder used during parallel Computation
boost::filesystem::path tmp_folder; boost::filesystem::path tmp_folder;
#ifndef WIN32 #ifndef WIN32