Salome HOME
projects
/
modules
/
yacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Help to debug when troubles at launch time
[modules/yacs.git]
/
src
/
runtime
/
CORBANode.cxx
diff --git
a/src/runtime/CORBANode.cxx
b/src/runtime/CORBANode.cxx
index e27e90ac0be7a57048998b037256c85dcea528ba..933e610ed10f7a096ab92ebb80cd70cfc5777d65 100644
(file)
--- a/
src/runtime/CORBANode.cxx
+++ b/
src/runtime/CORBANode.cxx
@@
-1,9
+1,9
@@
-// Copyright (C) 2006-20
13 CEA/DEN, EDF R&D
+// Copyright (C) 2006-20
24 CEA, EDF
//
// 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
//
// 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.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-35,9
+35,10
@@
#include "CalStreamPort.hxx"
#include "InPort.hxx"
#include "TypeCode.hxx"
#include "CalStreamPort.hxx"
#include "InPort.hxx"
#include "TypeCode.hxx"
+#include "AutoLocker.hxx"
#ifdef SALOME_KERNEL
#ifdef SALOME_KERNEL
-#include "SALOME_NamingService.hxx"
+#include "SALOME_NamingService
_Wrapper
.hxx"
#include "SALOME_LifeCycleCORBA.hxx"
#include "SALOME_Exception.hh"
#endif
#include "SALOME_LifeCycleCORBA.hxx"
#include "SALOME_Exception.hh"
#endif
@@
-351,10
+352,7
@@
void SalomeNode::connectService()
if(_setOfOutputDataStreamPort.size() == 0)return;
CORBA::Object_var objComponent=((SalomeComponent*)_component)->getCompoPtr();
if(_setOfOutputDataStreamPort.size() == 0)return;
CORBA::Object_var objComponent=((SalomeComponent*)_component)->getCompoPtr();
- SALOME_NamingService NS(getSALOMERuntime()->getOrb()) ;
- SALOME_LifeCycleCORBA LCC(&NS) ;
- CORBA::Object_var obj = NS.Resolve("/ConnectionManager");
- Engines::ConnectionManager_var manager=Engines::ConnectionManager::_narrow(obj);
+ ConnectionManager& manager = getSALOMERuntime()->getConnectionManager();
Engines::Superv_Component_var me=Engines::Superv_Component::_narrow(objComponent);
if( CORBA::is_nil(me) )
{
Engines::Superv_Component_var me=Engines::Superv_Component::_narrow(objComponent);
if( CORBA::is_nil(me) )
{
@@
-398,7
+396,7
@@
void SalomeNode::connectService()
}
try
{
}
try
{
- id=manager
->
connect(me,port->getName().c_str(),other,(*iterout)->getName().c_str());
+ id=manager
.
connect(me,port->getName().c_str(),other,(*iterout)->getName().c_str());
}
catch(Engines::DSC::PortNotDefined& ex)
{
}
catch(Engines::DSC::PortNotDefined& ex)
{
@@
-467,22
+465,19
@@
void SalomeNode::disconnectService()
{
DEBTRACE( "SalomeNode::disconnectService: "<<getName());
// in some rare cases, disconnectService can be called from 2 different threads
{
DEBTRACE( "SalomeNode::disconnectService: "<<getName());
// in some rare cases, disconnectService can be called from 2 different threads
- YACS::BASES::
Lock
lock(&_mutex);
+ YACS::BASES::
AutoLocker<YACS::BASES::Mutex>
lock(&_mutex);
if(ids.size() == 0)
return;
if(ids.size() == 0)
return;
- SALOME_NamingService NS(getSALOMERuntime()->getOrb()) ;
- SALOME_LifeCycleCORBA LCC(&NS) ;
- CORBA::Object_var obj = NS.Resolve("/ConnectionManager");
- Engines::ConnectionManager_var manager=Engines::ConnectionManager::_narrow(obj);
+ ConnectionManager& manager = getSALOMERuntime()->getConnectionManager();
std::list<Engines::ConnectionManager::connectionId>::iterator iter;
for(iter = ids.begin(); iter != ids.end(); iter++)
{
DEBTRACE("Trying to disconnect: " << *iter );
try
{
std::list<Engines::ConnectionManager::connectionId>::iterator iter;
for(iter = ids.begin(); iter != ids.end(); iter++)
{
DEBTRACE("Trying to disconnect: " << *iter );
try
{
- manager
->
disconnect(*iter,Engines::DSC::RemovingConnection);
+ manager
.
disconnect(*iter,Engines::DSC::RemovingConnection);
}
catch(Engines::ConnectionManager::BadId& ex)
{
}
catch(Engines::ConnectionManager::BadId& ex)
{