ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-11-15 18:18:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

0021480: EDF 2084 SMESH: SIGSEGV when validating Netgen3D hypothesis

Browse Source 
In destructor, delete all data and delete mesh DS in a thread
This commit is contained in:
eap 2012-01-24 12:59:44 +00:00
parent fe75082f74
commit fe663d61f6
1 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/SMESH/SMESH_Mesh.cxx
View File

@ -66,6 +66,9 @@
#include "Utils_ExceptHandlers.hxx" #include "Utils_ExceptHandlers.hxx"
#include <boost/thread/thread.hpp>
#include <boost/bind.hpp>
using namespace std; using namespace std;
// maximum stored group name length in MED file // maximum stored group name length in MED file
@ -116,14 +119,29 @@ SMESH_Mesh::SMESH_Mesh(int theLocalId,
//================================================================================ //================================================================================
SMESH_Mesh::SMESH_Mesh(): SMESH_Mesh::SMESH_Mesh():
_groupId( 0 ), _nbSubShapes( 0 ) _id(-1),
_studyId(-1),
_idDoc(-1),
_groupId( 0 ),
_nbSubShapes( 0 ),
_isShapeToMesh( false ),
_myDocument( 0 ),
_myMeshDS( 0 ),
_gen( 0 ),
_isAutoColor( false ),
_isModified( false ),
_shapeDiagonal( 0.0 ),
_rmGroupCallUp( 0 )
{ {
_myMeshDS = 0; }
_isShapeToMesh = false;
_isAutoColor = false; namespace
_isModified = false; {
_shapeDiagonal = 0.0; void deleteMeshDS(SMESHDS_Mesh* meshDS)
_rmGroupCallUp = 0; {
//cout << "deleteMeshDS( " << meshDS << endl;
delete meshDS;
}
} }
//============================================================================= //=============================================================================
@ -149,8 +167,27 @@ SMESH_Mesh::~SMESH_Mesh()
} }
_mapGroup.clear(); _mapGroup.clear();
// delete sub-meshes
map <int, SMESH_subMesh*>::iterator sm = _mapSubMesh.begin();
for ( ; sm != _mapSubMesh.end(); ++sm )
delete sm->second;
_mapSubMesh.clear();
if ( _rmGroupCallUp) delete _rmGroupCallUp; if ( _rmGroupCallUp) delete _rmGroupCallUp;
_rmGroupCallUp = 0; _rmGroupCallUp = 0;
// remove self from studyContext
if ( _gen )
{
StudyContextStruct * studyContext = _gen->GetStudyContext( _studyId );
studyContext->mapMesh.erase( _id );
}
if ( _myDocument )
_myDocument->RemoveMesh( _id );
if ( _myMeshDS )
// delete _myMeshDS, in a thread in order not to block closing a study with large meshes
boost::thread aThread(boost::bind( & deleteMeshDS, _myMeshDS ));
} }
//============================================================================= //=============================================================================