From a0ce3f98bd24ea8da1e60f027c1003cef5cfdacb Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 2 Apr 2018 09:05:31 +0300 Subject: [PATCH] Reapply commit b31c8411. This reverts commit e98f5c9609cbe485a448f2f345650f595f1a172a. --- src/GenericObj/SALOME_GenericObj_i.cc | 3 + src/Registry/SALOME_Registry_Server.cxx | 2 +- src/SALOMEDS/SALOMEDS.cxx | 19 +++++- src/SALOMEDS/SALOMEDS_ChildIterator_i.cxx | 23 ++++++- src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx | 2 + src/SALOMEDS/SALOMEDS_GenericAttribute_i.cxx | 21 ++++++- src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx | 2 + .../SALOMEDS_SComponentIterator_i.cxx | 22 ++++++- .../SALOMEDS_SComponentIterator_i.hxx | 2 + src/SALOMEDS/SALOMEDS_SObject_i.cxx | 20 +++++- src/SALOMEDS/SALOMEDS_SObject_i.hxx | 2 + src/SALOMEDS/SALOMEDS_Server.cxx | 18 +++++- src/SALOMEDS/SALOMEDS_Study.cxx | 5 ++ src/SALOMEDS/SALOMEDS_StudyBuilder.cxx | 4 ++ src/SALOMEDS/SALOMEDS_StudyBuilder.hxx | 3 + src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx | 18 ++++++ src/SALOMEDS/SALOMEDS_StudyBuilder_i.hxx | 2 + src/SALOMEDS/SALOMEDS_StudyManager_i.cxx | 34 ++++++++++ src/SALOMEDS/SALOMEDS_StudyManager_i.hxx | 3 + src/SALOMEDS/SALOMEDS_Study_i.cxx | 17 +++++ src/SALOMEDS/SALOMEDS_Study_i.hxx | 3 + src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.cxx | 21 ++++++- src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.hxx | 2 + src/SALOMEDS/SALOMEDS_UseCaseIterator_i.cxx | 21 ++++++- src/SALOMEDS/SALOMEDS_UseCaseIterator_i.hxx | 2 + src/Utils/Utils_ExceptHandlers.cxx | 62 ++++++++++++++++++- 26 files changed, 316 insertions(+), 17 deletions(-) diff --git a/src/GenericObj/SALOME_GenericObj_i.cc b/src/GenericObj/SALOME_GenericObj_i.cc index 80966ca6e..234933606 100644 --- a/src/GenericObj/SALOME_GenericObj_i.cc +++ b/src/GenericObj/SALOME_GenericObj_i.cc @@ -92,6 +92,8 @@ namespace SALOME else { myPOA = PortableServer::POA::_duplicate(thePOA); } + if(MYDEBUG) + MESSAGE("GenericObj_i::GenericObj_i thePOA: " << thePOA << " myPOA: " << myPOA); } /*! @@ -104,6 +106,7 @@ namespace SALOME */ PortableServer::POA_ptr GenericObj_i::_default_POA() { + MESSAGE("GenericObj_i::_default_POA: " << myPOA); return PortableServer::POA::_duplicate(myPOA); } diff --git a/src/Registry/SALOME_Registry_Server.cxx b/src/Registry/SALOME_Registry_Server.cxx index 97eed4f5e..62ef09e63 100644 --- a/src/Registry/SALOME_Registry_Server.cxx +++ b/src/Registry/SALOME_Registry_Server.cxx @@ -175,7 +175,7 @@ int main( int argc , char **argv ) policies.length(1); PortableServer::ThreadPolicy_var threadPol(poa->create_thread_policy(PortableServer::SINGLE_THREAD_MODEL)); policies[0]=PortableServer::ThreadPolicy::_duplicate(threadPol); - PortableServer::POA_var poa2(poa->create_POA("SingleThPOA4SDS",manager,policies)); + PortableServer::POA_var poa2(poa->create_POA("SingleThreadPOA4RegistryStandalone",manager,policies)); threadPol->destroy(); // PortableServer::ObjectId_var id(poa2->activate_object(ptrRegistry)); diff --git a/src/SALOMEDS/SALOMEDS.cxx b/src/SALOMEDS/SALOMEDS.cxx index 81a3ce56e..06dda3211 100644 --- a/src/SALOMEDS/SALOMEDS.cxx +++ b/src/SALOMEDS/SALOMEDS.cxx @@ -36,6 +36,7 @@ #include "SALOMEDSClient_IParameters.hxx" #include "SALOMEDS_IParameters.hxx" #include "SALOMEDS_StudyManager_i.hxx" +#include "utilities.h" #include "SALOMEDS_Defines.hxx" @@ -117,10 +118,22 @@ SALOMEDS_EXPORT SALOME_NamingService namingService(orb); CORBA::Object_var obj = namingService.Resolve( "/myStudyManager" ); SALOMEDS::StudyManager_var theManager = SALOMEDS::StudyManager::_narrow( obj ); - if( CORBA::is_nil(theManager) ) { - SALOMEDS_StudyManager_i * aStudyManager_i = new SALOMEDS_StudyManager_i(orb, root_poa); + if( CORBA::is_nil(theManager) ) + { + PortableServer::POAManager_var pman = root_poa->the_POAManager(); + CORBA::PolicyList policies; + policies.length(2); + PortableServer::ThreadPolicy_var threadPol(root_poa->create_thread_policy(PortableServer::SINGLE_THREAD_MODEL)); + PortableServer::ImplicitActivationPolicy_var implicitPol(root_poa->create_implicit_activation_policy(PortableServer::IMPLICIT_ACTIVATION)); + policies[0] = PortableServer::ThreadPolicy::_duplicate(threadPol); + policies[1] = PortableServer::ImplicitActivationPolicy::_duplicate(implicitPol); + PortableServer::POA_var poa = root_poa->create_POA("KERNELStudySingleThreadPOA",pman,policies); + MESSAGE("CreateStudyManager: KERNELStudySingleThreadPOA: "<< poa); + threadPol->destroy(); + + SALOMEDS_StudyManager_i * aStudyManager_i = new SALOMEDS_StudyManager_i(orb, poa); // Activate the objects. This tells the POA that the objects are ready to accept requests. - PortableServer::ObjectId_var aStudyManager_iid = root_poa->activate_object(aStudyManager_i); + PortableServer::ObjectId_var aStudyManager_iid = poa->activate_object(aStudyManager_i); //give ownership to the poa : the object will be deleted by the poa aStudyManager_i->_remove_ref(); aStudyManager_i->register_name((char*)"/myStudyManager"); diff --git a/src/SALOMEDS/SALOMEDS_ChildIterator_i.cxx b/src/SALOMEDS/SALOMEDS_ChildIterator_i.cxx index e5c3ad9e1..3a17656b0 100644 --- a/src/SALOMEDS/SALOMEDS_ChildIterator_i.cxx +++ b/src/SALOMEDS/SALOMEDS_ChildIterator_i.cxx @@ -25,6 +25,7 @@ // Module : SALOME // #include "SALOMEDS_ChildIterator_i.hxx" +#include "SALOMEDS_StudyManager_i.hxx" #include "SALOMEDS_SObject_i.hxx" #include "SALOMEDS.hxx" #include "SALOMEDSImpl_SObject.hxx" @@ -37,8 +38,9 @@ */ //============================================================================ SALOMEDS_ChildIterator_i::SALOMEDS_ChildIterator_i(const SALOMEDSImpl_ChildIterator& theImpl, - CORBA::ORB_ptr orb) - : _it(theImpl.GetPersistentCopy()) + CORBA::ORB_ptr orb) : + GenericObj_i(SALOMEDS_StudyManager_i::GetThePOA()), + _it(theImpl.GetPersistentCopy()) { SALOMEDS::Locker lock; _orb = CORBA::ORB::_duplicate(orb); @@ -54,6 +56,23 @@ SALOMEDS_ChildIterator_i::~SALOMEDS_ChildIterator_i() if(_it) delete _it; } +//============================================================================ +/*! + \brief Get default POA for the servant object. + + This function is implicitly called from "_this()" function. + Default POA can be set via the constructor. + + \return reference to the default POA for the servant +*/ +//============================================================================ +PortableServer::POA_ptr SALOMEDS_ChildIterator_i::_default_POA() +{ + myPOA = PortableServer::POA::_duplicate(SALOMEDS_StudyManager_i::GetThePOA()); + //MESSAGE("SALOMEDS_ChildIterator_i::_default_POA: " << myPOA); + return PortableServer::POA::_duplicate(myPOA); +} + //============================================================================ /*! Function :Init * diff --git a/src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx b/src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx index 4b68eaf35..779731f78 100644 --- a/src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx +++ b/src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx @@ -53,6 +53,8 @@ public: //! standard destructor ~SALOMEDS_ChildIterator_i(); + + virtual PortableServer::POA_ptr _default_POA(); virtual void Init(); virtual void InitEx(CORBA::Boolean); diff --git a/src/SALOMEDS/SALOMEDS_GenericAttribute_i.cxx b/src/SALOMEDS/SALOMEDS_GenericAttribute_i.cxx index 5b98df2db..114c0a228 100644 --- a/src/SALOMEDS/SALOMEDS_GenericAttribute_i.cxx +++ b/src/SALOMEDS/SALOMEDS_GenericAttribute_i.cxx @@ -26,6 +26,7 @@ // #include "utilities.h" #include "SALOMEDS_GenericAttribute_i.hxx" +#include "SALOMEDS_StudyManager_i.hxx" #include "SALOMEDS_Attributes.hxx" #include "SALOMEDS.hxx" #include "SALOMEDSImpl_SObject.hxx" @@ -43,7 +44,8 @@ UNEXPECT_CATCH(GALockProtection, SALOMEDS::GenericAttribute::LockProtection); -SALOMEDS_GenericAttribute_i::SALOMEDS_GenericAttribute_i(DF_Attribute* theImpl, CORBA::ORB_ptr theOrb) +SALOMEDS_GenericAttribute_i::SALOMEDS_GenericAttribute_i(DF_Attribute* theImpl, CORBA::ORB_ptr theOrb) : + GenericObj_i(SALOMEDS_StudyManager_i::GetThePOA()) { _orb = CORBA::ORB::_duplicate(theOrb); _impl = theImpl; @@ -53,6 +55,23 @@ SALOMEDS_GenericAttribute_i::~SALOMEDS_GenericAttribute_i() { } +//============================================================================ +/*! + \brief Get default POA for the servant object. + + This function is implicitly called from "_this()" function. + Default POA can be set via the constructor. + + \return reference to the default POA for the servant +*/ +//============================================================================ +PortableServer::POA_ptr SALOMEDS_GenericAttribute_i::_default_POA() +{ + myPOA = PortableServer::POA::_duplicate(SALOMEDS_StudyManager_i::GetThePOA()); + //MESSAGE("SALOMEDS_GenericAttribute_i::_default_POA: " << myPOA); + return PortableServer::POA::_duplicate(myPOA); +} + void SALOMEDS_GenericAttribute_i::CheckLocked() throw (SALOMEDS::GenericAttribute::LockProtection) { SALOMEDS::Locker lock; diff --git a/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx b/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx index 0654e26dd..b141ad266 100644 --- a/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx +++ b/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx @@ -48,6 +48,8 @@ public: SALOMEDS_GenericAttribute_i(DF_Attribute* theImpl, CORBA::ORB_ptr theOrb); virtual ~SALOMEDS_GenericAttribute_i(); + virtual PortableServer::POA_ptr _default_POA(); + void CheckLocked() throw (SALOMEDS::GenericAttribute::LockProtection); virtual char* Type(); diff --git a/src/SALOMEDS/SALOMEDS_SComponentIterator_i.cxx b/src/SALOMEDS/SALOMEDS_SComponentIterator_i.cxx index cc7d6700f..07b24a93c 100644 --- a/src/SALOMEDS/SALOMEDS_SComponentIterator_i.cxx +++ b/src/SALOMEDS/SALOMEDS_SComponentIterator_i.cxx @@ -27,6 +27,8 @@ #include "SALOMEDS_SComponentIterator_i.hxx" #include "SALOMEDS.hxx" #include "SALOMEDSImpl_SComponent.hxx" +#include "SALOMEDS_StudyManager_i.hxx" +#include "utilities.h" //============================================================================ /*! Function : constructor @@ -35,7 +37,8 @@ //============================================================================ SALOMEDS_SComponentIterator_i::SALOMEDS_SComponentIterator_i(const SALOMEDSImpl_SComponentIterator& theImpl, - CORBA::ORB_ptr orb) + CORBA::ORB_ptr orb) : + GenericObj_i(SALOMEDS_StudyManager_i::GetThePOA()) { _orb = CORBA::ORB::_duplicate(orb); _impl = theImpl.GetPersistentCopy(); @@ -51,6 +54,23 @@ SALOMEDS_SComponentIterator_i::~SALOMEDS_SComponentIterator_i() if(_impl) delete _impl; } +//============================================================================ +/*! + \brief Get default POA for the servant object. + + This function is implicitly called from "_this()" function. + Default POA can be set via the constructor. + + \return reference to the default POA for the servant +*/ +//============================================================================ +PortableServer::POA_ptr SALOMEDS_SComponentIterator_i::_default_POA() +{ + myPOA = PortableServer::POA::_duplicate(SALOMEDS_StudyManager_i::GetThePOA()); + MESSAGE("SALOMEDS_SComponentIterator_i::_default_POA: " << myPOA); + return PortableServer::POA::_duplicate(myPOA); +} + //============================================================================ /*! Function : Init * diff --git a/src/SALOMEDS/SALOMEDS_SComponentIterator_i.hxx b/src/SALOMEDS/SALOMEDS_SComponentIterator_i.hxx index 73124108f..928fe0530 100644 --- a/src/SALOMEDS/SALOMEDS_SComponentIterator_i.hxx +++ b/src/SALOMEDS/SALOMEDS_SComponentIterator_i.hxx @@ -54,6 +54,8 @@ public: SALOMEDS_SComponentIterator_i(const SALOMEDSImpl_SComponentIterator& theImpl, CORBA::ORB_ptr); ~SALOMEDS_SComponentIterator_i(); + + virtual PortableServer::POA_ptr _default_POA(); virtual void Init(); virtual CORBA::Boolean More(); diff --git a/src/SALOMEDS/SALOMEDS_SObject_i.cxx b/src/SALOMEDS/SALOMEDS_SObject_i.cxx index 210e0fa68..bfff08d5e 100644 --- a/src/SALOMEDS/SALOMEDS_SObject_i.cxx +++ b/src/SALOMEDS/SALOMEDS_SObject_i.cxx @@ -58,7 +58,8 @@ SALOMEDS::SObject_ptr SALOMEDS_SObject_i::New(const SALOMEDSImpl_SObject& theImp * Purpose : */ //============================================================================ -SALOMEDS_SObject_i::SALOMEDS_SObject_i(const SALOMEDSImpl_SObject& impl, CORBA::ORB_ptr orb) +SALOMEDS_SObject_i::SALOMEDS_SObject_i(const SALOMEDSImpl_SObject& impl, CORBA::ORB_ptr orb) : + GenericObj_i(SALOMEDS_StudyManager_i::GetThePOA()) { _impl = 0; if(!impl.IsNull()) { @@ -85,6 +86,23 @@ SALOMEDS_SObject_i::~SALOMEDS_SObject_i() if(_impl) delete _impl; } +//============================================================================ +/*! + \brief Get default POA for the servant object. + + This function is implicitly called from "_this()" function. + Default POA can be set via the constructor. + + \return reference to the default POA for the servant +*/ +//============================================================================ +PortableServer::POA_ptr SALOMEDS_SObject_i::_default_POA() +{ + myPOA = PortableServer::POA::_duplicate(SALOMEDS_StudyManager_i::GetThePOA()); + //MESSAGE("SALOMEDS_SObject_i::_default_POA: " << myPOA); + return PortableServer::POA::_duplicate(myPOA); +} + //================================================================================ /*! * \brief Returns true if the %SObject does not belong to any %Study diff --git a/src/SALOMEDS/SALOMEDS_SObject_i.hxx b/src/SALOMEDS/SALOMEDS_SObject_i.hxx index f996197fb..5c0bdc652 100644 --- a/src/SALOMEDS/SALOMEDS_SObject_i.hxx +++ b/src/SALOMEDS/SALOMEDS_SObject_i.hxx @@ -53,6 +53,8 @@ public: SALOMEDS_SObject_i(const SALOMEDSImpl_SObject&, CORBA::ORB_ptr); virtual ~SALOMEDS_SObject_i(); + + virtual PortableServer::POA_ptr _default_POA(); virtual CORBA::Boolean IsNull(); virtual char* GetID(); diff --git a/src/SALOMEDS/SALOMEDS_Server.cxx b/src/SALOMEDS/SALOMEDS_Server.cxx index 17a6583b0..a780abd6c 100644 --- a/src/SALOMEDS/SALOMEDS_Server.cxx +++ b/src/SALOMEDS/SALOMEDS_Server.cxx @@ -70,6 +70,7 @@ int main(int argc, char** argv) ts_rem.tv_nsec=0; ts_rem.tv_sec=0; CosNaming::NamingContext_var inc; + PortableServer::POA_var defaultPoa; PortableServer::POA_var poa; CORBA::Object_var theObj; CORBA::Object_var obj; @@ -95,9 +96,20 @@ int main(int argc, char** argv) { obj = orb->resolve_initial_references("RootPOA"); if(!CORBA::is_nil(obj)) - poa = PortableServer::POA::_narrow(obj); - if(!CORBA::is_nil(poa)) - pman = poa->the_POAManager(); + defaultPoa = PortableServer::POA::_narrow(obj); + if(!CORBA::is_nil(defaultPoa)) + pman = defaultPoa->the_POAManager(); + + PortableServer::POAManager_var pman = defaultPoa->the_POAManager(); + CORBA::PolicyList policies; + policies.length(2); + PortableServer::ThreadPolicy_var threadPol(defaultPoa->create_thread_policy(PortableServer::SINGLE_THREAD_MODEL)); + PortableServer::ImplicitActivationPolicy_var implicitPol(defaultPoa->create_implicit_activation_policy(PortableServer::IMPLICIT_ACTIVATION)); + policies[0] = PortableServer::ThreadPolicy::_duplicate(threadPol); + policies[1] = PortableServer::ImplicitActivationPolicy::_duplicate(implicitPol); + poa = defaultPoa->create_POA("KERNELStandaloneStudySingleThreadPOA",pman,policies); + threadPol->destroy(); + if(!CORBA::is_nil(orb)) theObj = orb->resolve_initial_references("NameService"); if (!CORBA::is_nil(theObj)){ diff --git a/src/SALOMEDS/SALOMEDS_Study.cxx b/src/SALOMEDS/SALOMEDS_Study.cxx index 63d44b5ac..50d658b7d 100644 --- a/src/SALOMEDS/SALOMEDS_Study.cxx +++ b/src/SALOMEDS/SALOMEDS_Study.cxx @@ -68,6 +68,9 @@ SALOMEDS_Study::SALOMEDS_Study(SALOMEDSImpl_Study* theStudy) _isLocal = true; _local_impl = theStudy; _corba_impl = SALOMEDS::Study::_nil(); + + pthread_mutex_init( &SALOMEDS_StudyBuilder::_remoteBuilderMutex, 0 ); + init_orb(); } @@ -79,6 +82,8 @@ SALOMEDS_Study::SALOMEDS_Study(SALOMEDS::Study_ptr theStudy) long pid = (long)getpid(); #endif + pthread_mutex_init( &SALOMEDS_StudyBuilder::_remoteBuilderMutex, 0 ); + long addr = theStudy->GetLocalImpl(Kernel_Utils::GetHostname().c_str(), pid, _isLocal); if(_isLocal) { _local_impl = reinterpret_cast(addr); diff --git a/src/SALOMEDS/SALOMEDS_StudyBuilder.cxx b/src/SALOMEDS/SALOMEDS_StudyBuilder.cxx index f23777af1..8aeed232c 100644 --- a/src/SALOMEDS/SALOMEDS_StudyBuilder.cxx +++ b/src/SALOMEDS/SALOMEDS_StudyBuilder.cxx @@ -50,6 +50,8 @@ #include "Utils_ORB_INIT.hxx" #include "Utils_SINGLETON.hxx" +pthread_mutex_t SALOMEDS_StudyBuilder::_remoteBuilderMutex; + SALOMEDS_StudyBuilder::SALOMEDS_StudyBuilder(SALOMEDSImpl_StudyBuilder* theBuilder) { _isLocal = true; @@ -61,6 +63,7 @@ SALOMEDS_StudyBuilder::SALOMEDS_StudyBuilder(SALOMEDSImpl_StudyBuilder* theBuild SALOMEDS_StudyBuilder::SALOMEDS_StudyBuilder(SALOMEDS::StudyBuilder_ptr theBuilder) { + pthread_mutex_lock( &_remoteBuilderMutex ); _isLocal = false; _local_impl = NULL; _corba_impl = SALOMEDS::StudyBuilder::_duplicate(theBuilder); @@ -70,6 +73,7 @@ SALOMEDS_StudyBuilder::SALOMEDS_StudyBuilder(SALOMEDS::StudyBuilder_ptr theBuild SALOMEDS_StudyBuilder::~SALOMEDS_StudyBuilder() { + if (!_isLocal) pthread_mutex_unlock( &_remoteBuilderMutex ); } _PTR(SComponent) SALOMEDS_StudyBuilder::NewComponent(const std::string& ComponentDataType) diff --git a/src/SALOMEDS/SALOMEDS_StudyBuilder.hxx b/src/SALOMEDS/SALOMEDS_StudyBuilder.hxx index b7e3a6160..37336327f 100644 --- a/src/SALOMEDS/SALOMEDS_StudyBuilder.hxx +++ b/src/SALOMEDS/SALOMEDS_StudyBuilder.hxx @@ -31,6 +31,7 @@ #include "SALOMEDSClient.hxx" #include "SALOMEDSImpl_StudyBuilder.hxx" +#include // IDL headers #include @@ -44,7 +45,9 @@ private: SALOMEDS::StudyBuilder_var _corba_impl; CORBA::ORB_var _orb; + public: + static pthread_mutex_t _remoteBuilderMutex; SALOMEDS_StudyBuilder(SALOMEDSImpl_StudyBuilder* theBuilder); SALOMEDS_StudyBuilder(SALOMEDS::StudyBuilder_ptr theBuilder); diff --git a/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx b/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx index a31fda64c..e3013e714 100644 --- a/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx +++ b/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx @@ -26,6 +26,7 @@ // #include "utilities.h" #include "SALOMEDS_StudyBuilder_i.hxx" +#include "SALOMEDS_StudyManager_i.hxx" #include "SALOMEDS_Study_i.hxx" #include "SALOMEDS_SObject_i.hxx" #include "SALOMEDS_SComponent_i.hxx" @@ -67,6 +68,23 @@ SALOMEDS_StudyBuilder_i::SALOMEDS_StudyBuilder_i(SALOMEDSImpl_StudyBuilder* theI SALOMEDS_StudyBuilder_i::~SALOMEDS_StudyBuilder_i() {} +//============================================================================ +/*! + \brief Get default POA for the servant object. + + This function is implicitly called from "_this()" function. + Default POA can be set via the constructor. + + \return reference to the default POA for the servant +*/ +//============================================================================ +PortableServer::POA_ptr SALOMEDS_StudyBuilder_i::_default_POA() +{ + PortableServer::POA_ptr poa = SALOMEDS_StudyManager_i::GetThePOA(); + MESSAGE("SALOMEDS_StudyBuilder_i::_default_POA: " << poa); + return PortableServer::POA::_duplicate(poa); +} + //============================================================================ /*! Function : NewComponent * Purpose : Create a new component (Scomponent) diff --git a/src/SALOMEDS/SALOMEDS_StudyBuilder_i.hxx b/src/SALOMEDS/SALOMEDS_StudyBuilder_i.hxx index d4c30fb74..99b44a92c 100644 --- a/src/SALOMEDS/SALOMEDS_StudyBuilder_i.hxx +++ b/src/SALOMEDS/SALOMEDS_StudyBuilder_i.hxx @@ -48,6 +48,8 @@ public: ~SALOMEDS_StudyBuilder_i(); + virtual PortableServer::POA_ptr _default_POA(); + //! NewComponent /*! \param ComponentDataType diff --git a/src/SALOMEDS/SALOMEDS_StudyManager_i.cxx b/src/SALOMEDS/SALOMEDS_StudyManager_i.cxx index c5eefdfaa..0db23404c 100644 --- a/src/SALOMEDS/SALOMEDS_StudyManager_i.cxx +++ b/src/SALOMEDS/SALOMEDS_StudyManager_i.cxx @@ -69,6 +69,11 @@ SALOMEDS_StudyManager_i::SALOMEDS_StudyManager_i(CORBA::ORB_ptr orb, PortableSer { _orb = CORBA::ORB::_duplicate(orb); _poa = PortableServer::POA::_duplicate(thePOA); + MESSAGE("thePOA, _poa="<<_poa); + if (_mapOfPOA.empty()) + _mapOfPOA[0] = _poa; + else + MESSAGE("_mapOfPOA[0] already contains: " << _mapOfPOA[0]); _name_service = new SALOME_NamingService(_orb); // Study directory creation in the naming service : to register all // open studies in the session @@ -91,6 +96,22 @@ SALOMEDS_StudyManager_i::~SALOMEDS_StudyManager_i() delete _impl; } +//============================================================================ +/*! + \brief Get default POA for the servant object. + + This function is implicitly called from "_this()" function. + Default POA can be set via the constructor. + + \return reference to the default POA for the servant +*/ +//============================================================================ +PortableServer::POA_ptr SALOMEDS_StudyManager_i::_default_POA() +{ + MESSAGE("SALOMEDS_StudyManager_i::_default_POA: " << _poa); + return PortableServer::POA::_duplicate(_poa); +} + //============================================================================ /*! Function : register_name * Purpose : Register the study Manager in the naming service under the @@ -487,6 +508,19 @@ PortableServer::POA_ptr SALOMEDS_StudyManager_i::GetPOA(const SALOMEDS::Study_pt return PortableServer::POA::_nil(); } +PortableServer::POA_ptr SALOMEDS_StudyManager_i::GetThePOA() +{ + std::map::iterator iter = _mapOfPOA.begin(); + if (iter != _mapOfPOA.end()) + { + PortableServer::POA_ptr aPoa = iter->second; + //MESSAGE("GetThePOA(): "<< aPoa); + return aPoa; + } + MESSAGE("GetThePOA(): _nil !"); + return PortableServer::POA::_nil(); +} + CORBA::Long SALOMEDS_StudyManager_i::getPID() { #ifdef WIN32 diff --git a/src/SALOMEDS/SALOMEDS_StudyManager_i.hxx b/src/SALOMEDS/SALOMEDS_StudyManager_i.hxx index ba1daf0eb..05225c75e 100644 --- a/src/SALOMEDS/SALOMEDS_StudyManager_i.hxx +++ b/src/SALOMEDS/SALOMEDS_StudyManager_i.hxx @@ -71,6 +71,8 @@ public: //! standard destructor virtual ~SALOMEDS_StudyManager_i(); + virtual PortableServer::POA_ptr _default_POA(); + //! method to Register study Manager in the naming service /*! \param char* arguments, the context to register the study manager in the NS @@ -149,6 +151,7 @@ public: virtual CORBA::LongLong GetLocalImpl(const char* theHostname, CORBA::Long thePID, CORBA::Boolean& isLocal); static PortableServer::POA_ptr GetPOA(const SALOMEDS::Study_ptr theStudy); + static PortableServer::POA_ptr GetThePOA(); void Shutdown() { if(!CORBA::is_nil(_orb)) _orb->shutdown(0); } }; diff --git a/src/SALOMEDS/SALOMEDS_Study_i.cxx b/src/SALOMEDS/SALOMEDS_Study_i.cxx index d0b936acc..3d99e2b73 100644 --- a/src/SALOMEDS/SALOMEDS_Study_i.cxx +++ b/src/SALOMEDS/SALOMEDS_Study_i.cxx @@ -274,6 +274,23 @@ SALOMEDS_Study_i::~SALOMEDS_Study_i() _mapOfStudies.erase(_impl); } +//============================================================================ +/*! + \brief Get default POA for the servant object. + + This function is implicitly called from "_this()" function. + Default POA can be set via the constructor. + + \return reference to the default POA for the servant +*/ +//============================================================================ +PortableServer::POA_ptr SALOMEDS_Study_i::_default_POA() +{ + PortableServer::POA_ptr poa = SALOMEDS_StudyManager_i::GetThePOA(); + MESSAGE("SALOMEDS_Study_i::_default_POA: " << poa); + return PortableServer::POA::_duplicate(poa); +} + //============================================================================ /*! Function : GetPersistentReference * Purpose : Get persistent reference of study (idem URL()) diff --git a/src/SALOMEDS/SALOMEDS_Study_i.hxx b/src/SALOMEDS/SALOMEDS_Study_i.hxx index a767e6414..59fed5664 100644 --- a/src/SALOMEDS/SALOMEDS_Study_i.hxx +++ b/src/SALOMEDS/SALOMEDS_Study_i.hxx @@ -38,6 +38,7 @@ #include //SALOMEDS headers +#include "SALOMEDS_StudyManager_i.hxx" #include "SALOMEDS_SComponentIterator_i.hxx" #include "SALOMEDS_StudyBuilder_i.hxx" #include "SALOMEDS_SObject_i.hxx" @@ -64,6 +65,8 @@ public: //! standard destructor virtual ~SALOMEDS_Study_i(); + + virtual PortableServer::POA_ptr _default_POA(); //! method to Get persistent reference of study (idem URL()) /*! diff --git a/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.cxx b/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.cxx index 118ab2d81..4c4d3fdd4 100644 --- a/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.cxx +++ b/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.cxx @@ -28,6 +28,7 @@ #include "SALOMEDS_UseCaseIterator_i.hxx" #include "SALOMEDS_SObject_i.hxx" #include "SALOMEDS.hxx" +#include "SALOMEDS_StudyManager_i.hxx" #include "utilities.h" @@ -37,7 +38,8 @@ */ //============================================================================ SALOMEDS_UseCaseBuilder_i::SALOMEDS_UseCaseBuilder_i(SALOMEDSImpl_UseCaseBuilder* theImpl, - CORBA::ORB_ptr orb) + CORBA::ORB_ptr orb) : + GenericObj_i(SALOMEDS_StudyManager_i::GetThePOA()) { _orb = CORBA::ORB::_duplicate(orb); _impl = theImpl; @@ -52,6 +54,23 @@ SALOMEDS_UseCaseBuilder_i::~SALOMEDS_UseCaseBuilder_i() { } +//============================================================================ +/*! + \brief Get default POA for the servant object. + + This function is implicitly called from "_this()" function. + Default POA can be set via the constructor. + + \return reference to the default POA for the servant +*/ +//============================================================================ +PortableServer::POA_ptr SALOMEDS_UseCaseBuilder_i::_default_POA() +{ + myPOA = PortableServer::POA::_duplicate(SALOMEDS_StudyManager_i::GetThePOA()); + //MESSAGE("SALOMEDS_UseCaseBuilder_i::_default_POA: " << myPOA); + return PortableServer::POA::_duplicate(myPOA); +} + //============================================================================ /*! Function : Append diff --git a/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.hxx b/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.hxx index b7edf4d81..42a836e0d 100644 --- a/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.hxx +++ b/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.hxx @@ -58,6 +58,8 @@ public: //! standard destructor ~SALOMEDS_UseCaseBuilder_i(); + + virtual PortableServer::POA_ptr _default_POA(); virtual CORBA::Boolean Append(SALOMEDS::SObject_ptr theObject); diff --git a/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.cxx b/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.cxx index cb3babe76..dd34e11b7 100644 --- a/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.cxx +++ b/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.cxx @@ -27,6 +27,7 @@ #include "SALOMEDS_UseCaseIterator_i.hxx" #include "SALOMEDS_SObject_i.hxx" #include "SALOMEDS.hxx" +#include "SALOMEDS_StudyManager_i.hxx" #include "SALOMEDSImpl_SObject.hxx" #include "utilities.h" @@ -37,7 +38,8 @@ */ //============================================================================ SALOMEDS_UseCaseIterator_i::SALOMEDS_UseCaseIterator_i(const SALOMEDSImpl_UseCaseIterator& theImpl, - CORBA::ORB_ptr orb) + CORBA::ORB_ptr orb) : + GenericObj_i(SALOMEDS_StudyManager_i::GetThePOA()) { _orb = CORBA::ORB::_duplicate(orb); _impl = theImpl.GetPersistentCopy(); @@ -53,6 +55,23 @@ SALOMEDS_UseCaseIterator_i::~SALOMEDS_UseCaseIterator_i() if(_impl) delete _impl; } +//============================================================================ +/*! + \brief Get default POA for the servant object. + + This function is implicitly called from "_this()" function. + Default POA can be set via the constructor. + + \return reference to the default POA for the servant +*/ +//============================================================================ +PortableServer::POA_ptr SALOMEDS_UseCaseIterator_i::_default_POA() +{ + myPOA = PortableServer::POA::_duplicate(SALOMEDS_StudyManager_i::GetThePOA()); + //MESSAGE("SALOMEDS_UseCaseIterator_i::_default_POA: " << myPOA); + return PortableServer::POA::_duplicate(myPOA); +} + //============================================================================ /*! Function :Init * diff --git a/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.hxx b/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.hxx index fbba0d691..a659cd81a 100644 --- a/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.hxx +++ b/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.hxx @@ -53,6 +53,8 @@ public: //! standard destructor ~SALOMEDS_UseCaseIterator_i(); + + virtual PortableServer::POA_ptr _default_POA(); virtual void Init(CORBA::Boolean); virtual CORBA::Boolean More(); diff --git a/src/Utils/Utils_ExceptHandlers.cxx b/src/Utils/Utils_ExceptHandlers.cxx index e77e7d898..1e96fd0fe 100644 --- a/src/Utils/Utils_ExceptHandlers.cxx +++ b/src/Utils/Utils_ExceptHandlers.cxx @@ -29,15 +29,71 @@ #include "Utils_CorbaException.hxx" #include "Utils_SALOME_Exception.hxx" +#include +#include +#include +#include + #include #include CORBA_SERVER_HEADER(SALOME_Exception) +//#define NBLINES_BACKTRACE 64 + +void printBacktrace(void **stacklines, int nbLines, std::stringstream& txt) +{ + char **stackSymbols = backtrace_symbols(stacklines, nbLines); + for (int i = 0; i < nbLines; i++) + { + Dl_info infodl; + if (dladdr(stacklines[i], &infodl)) + { + txt << i << " " << infodl.dli_fname << " " << infodl.dli_fbase << " "; + char *demangled = NULL; + int status = 0; + demangled = abi::__cxa_demangle(infodl.dli_sname, NULL, 0, &status); + if (status == 0 && demangled != NULL) + { + std::string demangstr = demangled; // copy + txt << demangstr; + } + else + { + if (infodl.dli_sname != 0 && infodl.dli_sname[0] != 0) + { + std::string sname = infodl.dli_sname; + if (sname.size() > 0) + txt << infodl.dli_sname; + } + } + txt << " " << infodl.dli_saddr; + txt << std::endl; + free(demangled); + } + else + txt << i << " " << stackSymbols[i] << std::endl; + } + free(stackSymbols); +} + void SalomeException () { - throw SALOME_Exception("Salome Exception"); + void *stacklines[64]; + size_t nbLines; + nbLines = backtrace(stacklines, 64); + std::stringstream txt; + txt << "Salome Exception" << std::endl; + printBacktrace(stacklines, nbLines, txt); + throw SALOME_Exception(txt.str().c_str()); } -void SALOME_SalomeException() { - THROW_SALOME_CORBA_EXCEPTION("INTERNAL ERROR", SALOME::INTERNAL_ERROR); +void SALOME_SalomeException() +{ + void *stacklines[64]; + size_t nbLines; + nbLines = backtrace(stacklines, 64); + std::stringstream txt; + txt << "INTERNAL_ERROR, backtrace stack:" << nbLines << std::endl; + printBacktrace(stacklines, nbLines, txt); + THROW_SALOME_CORBA_EXCEPTION(txt.str().c_str(), SALOME::INTERNAL_ERROR); } -- 2.39.2