X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FParallelContainer%2FSALOME_ParallelContainerProxyMpi.cxx;h=d9cd75b23492e73bee3b742719935bc9d83708a6;hb=910e1b8c12ac2978e64847e9694b080c8381bc60;hp=f14b09e1805e17755f3cab92cc78b7ae7fa79c03;hpb=f14439749926cca959747bb79fda10529520bd0b;p=modules%2Fkernel.git diff --git a/src/ParallelContainer/SALOME_ParallelContainerProxyMpi.cxx b/src/ParallelContainer/SALOME_ParallelContainerProxyMpi.cxx index f14b09e18..d9cd75b23 100644 --- a/src/ParallelContainer/SALOME_ParallelContainerProxyMpi.cxx +++ b/src/ParallelContainer/SALOME_ParallelContainerProxyMpi.cxx @@ -1,35 +1,35 @@ -// SALOME ParallelContainerProxyMpi : Launching the proxy of a MPI PaCO++ object +// Copyright (C) 2007-2016 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 +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. // -// Copyright (C) 2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. // +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME ParallelContainerProxyMpi : Launching the proxy of a MPI PaCO++ object // File : SALOME_ParallelContainerProxyMpi.cxx // Author : André Ribes, EDF // Module : SALOME PARALLEL - +// #include #include #include -#ifndef WNT +#ifndef WIN32 #include #else #include @@ -38,28 +38,75 @@ //#include "SALOME_ComponentPaCO_Engines_Container_server.h" #include "SALOME_ParallelContainerProxy_i.hxx" #include -#include +#include #include #include "SALOME_NamingService.hxx" #include "utilities.h" +#include "Basics_Utils.hxx" #include "Utils_ORB_INIT.hxx" #include "Utils_SINGLETON.hxx" #include "SALOMETraceCollector.hxx" #include "OpUtil.hxx" -using namespace std; -#ifdef DEBUG_PARALLEL +#include "Container_init_python.hxx" + +#ifdef _DEBUG_ #include + +typedef void (*sighandler_t)(int); +sighandler_t setsig(int sig, sighandler_t handler) +{ + struct sigaction context, ocontext; + context.sa_handler = handler; + sigemptyset(&context.sa_mask); + context.sa_flags = 0; + if (sigaction(sig, &context, &ocontext) == -1) + return SIG_ERR; + return ocontext.sa_handler; +} + +void AttachDebugger() +{ + if(getenv ("DEBUGGER")) + { + std::stringstream exec; + exec << "$DEBUGGER SALOME_ParallelContainerProxyMpi " << getpid() << "&"; + std::cerr << exec.str() << std::endl; + system(exec.str().c_str()); + while(1); + } +} + +void Handler(int theSigId) +{ + std::cerr << "SIGSEGV: " << std::endl; + AttachDebugger(); + //to exit or not to exit + exit(1); +} + +void terminateHandler(void) +{ + std::cerr << "Terminate: not managed exception !" << std::endl; + AttachDebugger(); +} + +void unexpectedHandler(void) +{ + std::cerr << "Unexpected: unexpected exception !" << std::endl; + AttachDebugger(); +} + void handler(int t) { - cerr << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << endl; - cerr << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << endl; - cerr << "SIGSEGV in :" << getpid() << endl; - cerr << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << endl; - cerr << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << endl; + std::cerr << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << std::endl; + std::cerr << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << std::endl; + std::cerr << "SIGSEGV in :" << getpid() << std::endl; + std::cerr << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << std::endl; + std::cerr << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << std::endl; while (1) {} } #endif @@ -68,7 +115,7 @@ int main(int argc, char* argv[]) { INFOS("Launching a parallel Mpi proxy container"); -#ifdef DEBUG_PARALLEL +#ifdef _DEBUG_ signal(SIGSEGV, handler); #endif @@ -76,6 +123,18 @@ int main(int argc, char* argv[]) int provided; MPI_Init_thread(&argc, &argv, MPI_THREAD_SERIALIZED ,&provided); CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); + KERNEL_PYTHON::init_python(argc,argv); + +#ifdef _DEBUG_ + if(getenv ("DEBUGGER")) + { + std::cerr << "Unexpected: unexpected exception !" << std::endl; + setsig(SIGSEGV,&Handler); + //set_terminate(&terminateHandler); + set_terminate(__gnu_cxx::__verbose_terminate_handler); + set_unexpected(&unexpectedHandler); + } +#endif std::string containerName(""); containerName = argv[1]; @@ -88,7 +147,7 @@ int main(int argc, char* argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow(obj); PortableServer::POAManager_var pman = root_poa->the_POAManager(); -#ifndef WNT +#ifndef WIN32 // add this container to the kill list char aCommand[100]; sprintf(aCommand, "addToKillList.py %d SALOME_ParallelContainerProxyMpi", getpid()); @@ -96,37 +155,43 @@ int main(int argc, char* argv[]) #endif SALOME_NamingService * ns = new SALOME_NamingService(CORBA::ORB::_duplicate(orb)); -// Engines::Container_proxy_impl * proxy = -// new Engines::Container_proxy_impl(orb, -// new paco_omni_fabrique()); - Container_proxy_impl_final * proxy = - new Container_proxy_impl_final(orb, - new paco_omni_fabrique()); // PaCO++ code paco_fabrique_manager* pfm = paco_getFabriqueManager(); - pfm->register_com("mpi", new paco_mpi_fabrique()); - MPI_Comm group = MPI_COMM_WORLD; - proxy->setLibCom("mpi", &group); + pfm->register_com("dummy", new paco_dummy_fabrique()); pfm->register_thread("omnithread", new paco_omni_fabrique()); + + Container_proxy_impl_final * proxy = new Container_proxy_impl_final(orb, + pfm->get_thread("omnithread"), + root_poa, + containerName); + + // PaCO++ code + proxy->setLibCom("dummy", proxy); proxy->setLibThread("omnithread"); PaCO::PacoTopology_t serveur_topo; serveur_topo.total = nb_nodes; proxy->setTopology(serveur_topo); // Activation - PortableServer::ObjectId_var _id = root_poa->activate_object(proxy); - obj = root_poa->id_to_reference(_id); + //PortableServer::ObjectId_var _id = root_poa->activate_object(proxy); + //obj = root_poa->id_to_reference(_id); + obj = proxy->_this(); // in the NamingService - string hostname = GetHostname(); + std::string hostname = Kernel_Utils::GetHostname(); Engines::Container_var pCont = Engines::Container::_narrow(obj); - string _containerName = ns->BuildContainerNameForNS(containerName.c_str(), - hostname.c_str()); - cerr << "---------" << _containerName << "----------" << endl; + std::string _containerName = ns->BuildContainerNameForNS(containerName.c_str(), + hostname.c_str()); + std::cerr << "---------" << _containerName << "----------" << std::endl; ns->Register(pCont, _containerName.c_str()); pman->activate(); orb->run(); + PyGILState_Ensure(); + //Delete python container that destroy orb from python (pyCont._orb.destroy()) + Py_Finalize(); + MPI_Finalize(); + delete ns; } catch (PaCO::PACO_Exception& e) { @@ -153,9 +218,6 @@ int main(int argc, char* argv[]) { INFOS("Caught unknown exception."); } - - MPI_Finalize(); - return 0 ; }