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
[PortManager] Separate ports according to their owner (this or other application)
[modules/yacs.git]
/
src
/
LifeCycleCORBA
/
SALOME_LifeCycleCORBA.cxx
diff --git
a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
index 1ae97eef7d288eca7ef0fafd6e3429468cd1aa3a..75bf0dd5ee72f618b6f6560013141cb96770c096 100644
(file)
--- a/
src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
+++ b/
src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-6,7
+6,7
@@
// 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
@@
-42,14
+42,19
@@
#include <ServiceUnreachable.hxx>
#include "SALOME_LifeCycleCORBA.hxx"
#include <ServiceUnreachable.hxx>
#include "SALOME_LifeCycleCORBA.hxx"
+#include "SALOME_ResourcesManager.hxx"
+#include "SALOMESDS_DataServerManager.hxx"
+
#include CORBA_CLIENT_HEADER(SALOME_ModuleCatalog)
#include CORBA_CLIENT_HEADER(SALOME_Session)
#include CORBA_CLIENT_HEADER(DSC_Engines)
#include CORBA_CLIENT_HEADER(SALOME_Registry)
#include CORBA_CLIENT_HEADER(SALOMEDS)
#include CORBA_CLIENT_HEADER(SALOME_ModuleCatalog)
#include CORBA_CLIENT_HEADER(SALOME_Session)
#include CORBA_CLIENT_HEADER(DSC_Engines)
#include CORBA_CLIENT_HEADER(SALOME_Registry)
#include CORBA_CLIENT_HEADER(SALOMEDS)
+#include CORBA_CLIENT_HEADER(SALOME_SDS)
#include CORBA_CLIENT_HEADER(Logger)
#include CORBA_CLIENT_HEADER(SALOME_Launcher)
#include CORBA_CLIENT_HEADER(Logger)
#include CORBA_CLIENT_HEADER(SALOME_Launcher)
+#include "SALOME_ResourcesManager.hxx"
#include "SALOME_ContainerManager.hxx"
#include "SALOME_Component_i.hxx"
#include "SALOME_NamingService.hxx"
#include "SALOME_ContainerManager.hxx"
#include "SALOME_Component_i.hxx"
#include "SALOME_NamingService.hxx"
@@
-421,7
+426,7
@@
Engines::ResourcesManager_ptr SALOME_LifeCycleCORBA::getResourcesManager()
}
//=============================================================================
}
//=============================================================================
-/*! \brief shutdown all the SALOME servers except SALOME_Session_Server
, omniNames and notifd
+/*! \brief shutdown all the SALOME servers except SALOME_Session_Server
and omniNames
*/
//=============================================================================
*/
//=============================================================================
@@
-502,8
+507,20
@@
void SALOME_LifeCycleCORBA::shutdownServers()
#ifndef WIN32
nanosleep(&ts_req,0);
#endif
#ifndef WIN32
nanosleep(&ts_req,0);
#endif
+ // 4 ) Remote ScopeServer (the DataServer is hosted by SalomeLauncher shutdown right after)
+ try
+ {
+ CORBA::Object_var objDSM(_NS->Resolve(SALOMESDS::DataServerManager::NAME_IN_NS));
+ SALOME::DataServerManager_var dsm(SALOME::DataServerManager::_narrow(objDSM));
+ if ( !CORBA::is_nil(dsm) )
+ dsm->shutdownScopes();
+ }
+ catch(const CORBA::Exception& e)
+ {
+ // ignore and continue
+ }
- //
4
) SalomeLauncher
+ //
5
) SalomeLauncher
try
{
CORBA::Object_var objSL = _NS->Resolve("/SalomeLauncher");
try
{
CORBA::Object_var objSL = _NS->Resolve("/SalomeLauncher");
@@
-521,7
+538,7
@@
void SALOME_LifeCycleCORBA::shutdownServers()
nanosleep(&ts_req,0);
#endif
nanosleep(&ts_req,0);
#endif
- //
5
) Registry
+ //
6
) Registry
try
{
CORBA::Object_var objR = _NS->Resolve("/Registry");
try
{
CORBA::Object_var objR = _NS->Resolve("/Registry");
@@
-534,20
+551,6
@@
void SALOME_LifeCycleCORBA::shutdownServers()
// ignore and continue
}
// ignore and continue
}
- /*
- // 6) Session
- if ( !CORBA::is_nil( session ) ) {
- try
- {
- session->Shutdown();
- }
- catch(const CORBA::Exception& e)
- {
- // ignore and continue
- }
- }
- */
-
// 7) Logger
int argc = 0;
char *xargv = (char*)"";
// 7) Logger
int argc = 0;
char *xargv = (char*)"";
@@
-587,36
+590,42
@@
void SALOME_LifeCycleCORBA::shutdownServers()
}
//=============================================================================
}
//=============================================================================
-/*! \brief shutdown omniNames
and notifd
+/*! \brief shutdown omniNames
*/
//=============================================================================
void SALOME_LifeCycleCORBA::killOmniNames()
{
std::string portNumber (::getenv ("NSPORT") );
*/
//=============================================================================
void SALOME_LifeCycleCORBA::killOmniNames()
{
std::string portNumber (::getenv ("NSPORT") );
+ std::string python_exe;
+
+ python_exe = std::string("python");
+
if ( !portNumber.empty() )
{
if ( !portNumber.empty() )
{
-#ifdef WIN32
-#else
- std::string cmd ;
- cmd = std::string( "ps -eo pid,command | grep -v grep | grep -E \"omniNames.*")
- + portNumber
- + std::string("\" | awk '{cmd=sprintf(\"kill -9 %s\",$1); system(cmd)}'" );
+ std::string cmd;
+
+ cmd = std::string("from salome_utils import killOmniNames; ");
+ cmd += std::string("killOmniNames(") + portNumber + "); ";
+ cmd = python_exe + std::string(" -c \"") + cmd +"\"";
MESSAGE(cmd);
MESSAGE(cmd);
- try {
- system ( cmd.c_str() );
- }
- catch ( ... ) {
- }
-#endif
+ system( cmd.c_str() );
+
+ cmd = std::string("from killSalomeWithPort import cleanApplication; ");
+ cmd += std::string("cleanApplication(") + portNumber + "); ";
+ cmd = python_exe + std::string(" -c \"") + cmd +"\"";
+ MESSAGE(cmd);
+ system( cmd.c_str() );
}
}
- //
NPAL 18309 (Kill Notifd)
+ //
shutdown portmanager
if ( !portNumber.empty() )
{
if ( !portNumber.empty() )
{
- std::string cmd = ("from killSalomeWithPort import killNotifdAndClean; ");
- cmd += std::string("killNotifdAndClean(") + portNumber + "); ";
- cmd = std::string("python -c \"") + cmd +"\" > /dev/null 2> /dev/null";
+ std::string cmd;
+
+ cmd = std::string("from PortManager import releasePort; ");
+ cmd += std::string("releasePort(") + portNumber + "); ";
+ cmd = python_exe + std::string(" -c \"") + cmd +"\"";
MESSAGE(cmd);
system( cmd.c_str() );
}
MESSAGE(cmd);
system( cmd.c_str() );
}