[EDF29150] : Container is able to keep track of input/output memory size and IO in...

[modules/kernel.git] / src / ModuleCatalog / SALOME_ModuleCatalog_Server.cxx

diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx
index 70edd524cf37342bcc3d1d3730e98ab60919a3b5..21f898d387a680b35e20d40c9230b8d36c7490b9 100644 (file)
--- a/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx
+++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2023  CEA, EDF, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -27,8 +27,10 @@
 /* $Header$ */
 
 #include <iostream>
+#include "ArgvKeeper.hxx"
 #include "SALOME_NamingService.hxx"
 #include "SALOME_ModuleCatalog_impl.hxx"
+#include "OpUtil.hxx"
 #include "utilities.h"
 #include "Utils_SINGLETON.hxx"
 
@@ -39,7 +41,8 @@
 int main(int argc,char **argv)
 {
   // initialize the ORB
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
+  SetArgcArgv(argc, argv);
+  CORBA::ORB_var orb = KERNEL::GetRefToORB();
   try 
     {
       CosNaming::NamingContext_var _rootContext, catalogContext;
@@ -48,9 +51,6 @@ int main(int argc,char **argv)
       //
       long TIMESleep = 500000000;
       int NumberOfTries = 40;
-#ifndef WIN32
-      int a;
-#endif
       timespec ts_req;
       ts_req.tv_nsec=TIMESleep;
       ts_req.tv_sec=0;
@@ -75,7 +75,7 @@ int main(int argc,char **argv)
         {
           if (i!=1) 
 #ifndef WIN32
-            a=nanosleep(&ts_req,&ts_rem);
+            nanosleep(&ts_req,&ts_rem);
 #else
             Sleep(TIMESleep/1000000);
 #endif
@@ -101,20 +101,20 @@ int main(int argc,char **argv)
                   INFOS( "Module Catalog Server: Naming Service was found" );
                   if(EnvL==1)
                     {
-                      CORBA::ORB_var orb1 = CORBA::ORB_init(argc,argv) ;
+                      CORBA::ORB_var orb1 = KERNEL::GetRefToORB() ;
                       SALOME_NamingService &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
                           try{
                             object = inc->resolve(name);}
-                          catch(CosNaming::NamingContext::NotFound)
+                          catch(CosNaming::NamingContext::NotFound&)
                             {
                               INFOS( "Logger Server wasn't found" );
                             }
@@ -150,7 +150,7 @@ int main(int argc,char **argv)
       // initialise Naming Service
       SALOME_NamingService _NS(orb);
       // register Catalog in Naming Service
-      _NS.Register(myCata ,"/Kernel/ModulCatalog");
+      _NS.Register(myCata ,SALOME_ModuleCatalogImpl::ENTRY_IN_NS);
 
       MESSAGE("Running CatalogServer.");