-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2021 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.
+// 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
// Module : SALOME
// $Header$
//
+#include "ArgvKeeper.hxx"
+#include "OpUtil.hxx"
#include "utilities.h"
#include "Utils_SINGLETON.hxx"
#include "SALOME_NamingService.hxx"
-#include "SALOMEDS_StudyManager_i.hxx"
+#include "SALOMEDS_Study_i.hxx"
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(SALOMEDS)
try
{
// Initialise the ORB.
-#if OMNIORB_VERSION >= 4
- CORBA::ORB_var orb = CORBA::ORB_init( argc, argv, "omniORB4" ) ;
-#else
- CORBA::ORB_var orb = CORBA::ORB_init( argc, argv, "omniORB3" );
-#endif
+ SetArgcArgv(argc, argv);
+ CORBA::ORB_var orb = KERNEL::GetRefToORB() ;
+ SALOME_NamingService* NS = 0;
// Obtain a reference to the root POA.
long TIMESleep = 500000000;
int NumberOfTries = 40;
- int a;
timespec ts_req;
ts_req.tv_nsec=TIMESleep;
ts_req.tv_sec=0;
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;
{
if (i!=1)
#ifndef WIN32
- a=nanosleep(&ts_req,&ts_rem);
+ nanosleep(&ts_req,&ts_rem);
#else
- Sleep(TIMESleep/1000000);
+ Sleep(TIMESleep/1000000);
#endif
try
{
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::ThreadPolicy_var threadPol(defaultPoa->create_thread_policy(PortableServer::ORB_CTRL_MODEL)); // default for all POAs
+ PortableServer::ImplicitActivationPolicy_var implicitPol(defaultPoa->create_implicit_activation_policy(PortableServer::IMPLICIT_ACTIVATION)); // default for Root_POA, NO for others
+ policies[0] = PortableServer::ThreadPolicy::_duplicate(threadPol);
+ policies[1] = PortableServer::ImplicitActivationPolicy::_duplicate(implicitPol);
+ poa = defaultPoa->create_POA("KERNELStandaloneStudySingleThreadPOA",pman,policies);
+ threadPol->destroy();
+ SALOMEDS_Study_i::SetThePOA(poa);
+
if(!CORBA::is_nil(orb))
theObj = orb->resolve_initial_references("NameService");
if (!CORBA::is_nil(theObj)){
MESSAGE( "SalomeDS Server: Naming Service was found" );
if(EnvL==1)
{
- CORBA::ORB_var orb1 = CORBA::ORB_init(argc,argv) ;
- SALOME_NamingService &NS = *SINGLETON_<SALOME_NamingService>::Instance() ;
- NS.init_orb( orb1 ) ;
+ CORBA::ORB_var orb1 = KERNEL::GetRefToORB() ;
+ NS = SINGLETON_<SALOME_NamingService>::Instance() ;
+ NS->init_orb( orb1 ) ;
for(int j=1; j<=NumberOfTries; j++)
{
if (j!=1)
#ifndef WIN32
- a=nanosleep(&ts_req, &ts_rem);
+ nanosleep(&ts_req, &ts_rem);
#else
Sleep(TIMESleep/1000000);
#endif
{
object = inc->resolve(name);
}
- catch(CosNaming::NamingContext::NotFound)
+ catch(CosNaming::NamingContext::NotFound&)
{
MESSAGE( "SalomeDS Server: Logger Server wasn't found" ); }
// We allocate the objects on the heap. Since these are reference
// counted objects, they will be deleted by the POA when they are no
// longer needed.
- SALOMEDS_StudyManager_i * myStudyManager_i = new SALOMEDS_StudyManager_i(orb,poa);
+ SALOMEDS_Study_i * myStudy_i = new SALOMEDS_Study_i(orb);
// Activate the objects. This tells the POA that the objects are
// ready to accept requests.
- PortableServer::ObjectId_var myStudyManager_iid = poa->activate_object(myStudyManager_i);
- myStudyManager_i->register_name("/myStudyManager");
- myStudyManager_i->_remove_ref();
+ PortableServer::ObjectId_var myStudy_iid = poa->activate_object(myStudy_i);
+ SALOMEDS::Study_var Study = myStudy_i->_this();
+ if (!NS)
+ {
+ NS = SINGLETON_<SALOME_NamingService>::Instance();
+ NS->init_orb( orb );
+ }
+ NS->Register(Study, "/Study");
+ myStudy_i->_remove_ref();
// Obtain a POAManager, and tell the POA to start accepting
// requests on its objects.
#endif
orb->run();
MESSAGE( "end of SALOME_DS server" );
+ NS->Destroy_Name("/Study");
orb->destroy();
}
catch(CORBA::SystemException&)
