Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CCAR: import_hook.py was too strict in ensure_list (ImportError raised)
[modules/kernel.git]
/
src
/
Container
/
SALOME_Container.cxx
diff --git
a/src/Container/SALOME_Container.cxx
b/src/Container/SALOME_Container.cxx
index cdcfc64a9a8a6a23991c25892453144f51623e02..fb89c99f5a5e81c86d10c240e5aec652c035f531 100644
(file)
--- a/
src/Container/SALOME_Container.cxx
+++ b/
src/Container/SALOME_Container.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
08
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
10
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-19,6
+19,7
@@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
// SALOME Container : implementation of container and engine for Kernel
// File : SALOME_Container.cxx
// Author : Paul RASCLE, EDF - MARC TAJCHMAN, CEA
// SALOME Container : implementation of container and engine for Kernel
// File : SALOME_Container.cxx
// Author : Paul RASCLE, EDF - MARC TAJCHMAN, CEA
@@
-59,8
+60,6
@@
#include "Container_init_python.hxx"
#include "Container_init_python.hxx"
-using namespace std;
-
extern "C" void HandleServerSideSignals(CORBA::ORB_ptr theORB);
#include <stdexcept>
extern "C" void HandleServerSideSignals(CORBA::ORB_ptr theORB);
#include <stdexcept>
@@
-70,7
+69,14
@@
extern "C" void HandleServerSideSignals(CORBA::ORB_ptr theORB);
# include <sys/wait.h>
#endif
# include <sys/wait.h>
#endif
+void AttachDebugger();
+void Handler(int);
+void terminateHandler();
+void unexpectedHandler();
+
#ifndef WIN32
#ifndef WIN32
+void (* setsig(int, void (*)(int)))(int);
+
typedef void (*sighandler_t)(int);
sighandler_t setsig(int sig, sighandler_t handler)
{
typedef void (*sighandler_t)(int);
sighandler_t setsig(int sig, sighandler_t handler)
{
@@
-100,10
+106,10
@@
void AttachDebugger()
void Handler(int theSigId)
{
void Handler(int theSigId)
{
- std::cerr << "S
IGSEGV: "
<< std::endl;
+ std::cerr << "S
ignal= "<< theSigId
<< std::endl;
AttachDebugger();
//to exit or not to exit
AttachDebugger();
//to exit or not to exit
- exit(1);
+
_
exit(1);
}
void terminateHandler(void)
}
void terminateHandler(void)
@@
-130,8
+136,9
@@
int main(int argc, char* argv[])
if(getenv ("DEBUGGER"))
{
setsig(SIGSEGV,&Handler);
if(getenv ("DEBUGGER"))
{
setsig(SIGSEGV,&Handler);
- set_terminate(&terminateHandler);
- set_unexpected(&unexpectedHandler);
+ setsig(SIGFPE,&Handler);
+ std::set_terminate(&terminateHandler);
+ std::set_unexpected(&unexpectedHandler);
}
#endif
}
#endif
@@
-148,20
+155,8
@@
int main(int argc, char* argv[])
ASSERT(argc > 1);
SCRUTE(argv[1]);
ASSERT(argc > 1);
SCRUTE(argv[1]);
- bool isSupervContainer = false;
- if (strcmp(argv[1],"SuperVisionContainer") == 0) isSupervContainer = true;
- if (!isSupervContainer)
- {
- // int _argc = 1;
- // char* _argv[] = {""};
- KERNEL_PYTHON::init_python(argc,argv);
- }
- else
- {
- Py_Initialize() ;
- PySys_SetArgv( argc , argv ) ;
- }
+ KERNEL_PYTHON::init_python(argc,argv);
char *containerName = (char *)"";
if(argc > 1)
char *containerName = (char *)"";
if(argc > 1)
@@
-179,8
+174,8
@@
int main(int argc, char* argv[])
// add new container to the kill list
#ifndef WIN32
// add new container to the kill list
#ifndef WIN32
- stringstream aCommand ;
- aCommand << "addToKillList.py " << getpid() << " SALOME_Container" << ends ;
+ st
d::st
ringstream aCommand ;
+ aCommand << "addToKillList.py " << getpid() << " SALOME_Container" <<
std::
ends ;
system(aCommand.str().c_str());
#endif
system(aCommand.str().c_str());
#endif
@@
-197,16
+192,15
@@
int main(int argc, char* argv[])
HandleServerSideSignals(orb);
HandleServerSideSignals(orb);
- if (!isSupervContainer)
- {
+//#define MEMORYLEAKS
+#ifdef MEMORYLEAKS
PyGILState_Ensure();
PyGILState_Ensure();
- //Delete python container that destroy orb from python (pyCont._orb.destroy())
+ //Destroy orb from python (for chasing memory leaks)
+ PyRun_SimpleString("from omniORB import CORBA");
+ PyRun_SimpleString("orb=CORBA.ORB_init([''], CORBA.ORB_ID)");
+ PyRun_SimpleString("orb.destroy()");
Py_Finalize();
Py_Finalize();
- }
- else
- {
- orb->destroy();
- }
+#endif
}
catch(CORBA::SystemException&)
{
}
catch(CORBA::SystemException&)
{
@@
-235,9
+229,6
@@
int main(int argc, char* argv[])
#endif
#endif
#endif
#endif
- //END_OF(argv[0]);
- //LocalTraceBufferPool* bp1 = LocalTraceBufferPool::instance();
- //bp1->deleteInstance(bp1);
return 0 ;
}
return 0 ;
}