Increment version: 7.6.0

[modules/kernel.git] / src / NamingService / NamingService_WaitForServerReadiness.cxx

diff --git a/src/NamingService/NamingService_WaitForServerReadiness.cxx b/src/NamingService/NamingService_WaitForServerReadiness.cxx
index b2ba19a51cd3112fca81740f26ba0a5636b1b25d..d9b054bd4b3e1cdad321ba2b8746afbd5657d55a 100644 (file)
--- a/src/NamingService/NamingService_WaitForServerReadiness.cxx
+++ b/src/NamingService/NamingService_WaitForServerReadiness.cxx
@@ -1,43 +1,42 @@
-//  Copyright (C) 2004  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. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// Copyright (C) 2007-2015  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, 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
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
 //  File   : NamingService_WaitForServerReadiness.cxx
 //  Author : Paul RASCLE (EDF)
 //  Module : KERNEL
 //  $Header$
-
+//
 #include "NamingService_WaitForServerReadiness.hxx"
 #include "utilities.h"
 #include <iostream>
 #include <ctime>
 
-using namespace std;
-
 // ============================================================================
 /*!
  * Wait until a server is registered in naming service.
  * \param serverName name of the server to find.
  * \param NS SALOME_NamingService object
  * Wait until the given server is ready i.e. is name is found in namingService.
- * Try 40 times, with 250 ms sleep between each try.
+ * Try 40 times, with 500 ms sleep between each try.
  * If Logger is used for traces, it must be ready before this call, because
  * SALOME_NamingService client uses SALOME traces. So, Logger readiness must be
  * checked in Launch script before execution of WaitForServerReadiness.
@@ -46,10 +45,10 @@ using namespace std;
 
 
 void NamingService_WaitForServerReadiness(SALOME_NamingService* NS,
-                                         string serverName)
+                                          std::string serverName)
 {
-  long TIMESleep = 250000000; // 250 ms.
-  int NumberOfTries = 40;     // total wait = 10 s.
+  long TIMESleep = 500000000; // 500 ms.
+  int NumberOfTries = 40;     // total wait = 20 s.
   int found = 0;
 
   timespec ts_req;
@@ -63,30 +62,38 @@ void NamingService_WaitForServerReadiness(SALOME_NamingService* NS,
   for (int itry=0; itry < NumberOfTries; itry++)
     {
       try
-       {
-         if (serverName.length() == 0)
-           {
-             string curdir = NS->Current_Directory(); // to wait for naming service
-             found = 1;
-             break; // naming service found
-           }
-         else
-           {
-             CORBA::Object_ptr obj = NS->Resolve(serverName.c_str());
-             if (! CORBA::is_nil(obj))
-               {
-                 found =1;
-                 break; // server found, no more try to do
-               }
-             MESSAGE("Server "<< serverName <<" not yet ready, waiting...");
-             int a = nanosleep(&ts_req,&ts_rem); // wait before retry
-           }
-       }
+        {
+          if (serverName.length() == 0)
+            {
+              CORBA::String_var dummyadr = NS->getIORaddr(); // to wait for naming service
+              found = 1;
+              break; // naming service found
+            }
+          else
+            {
+              CORBA::Object_var obj = NS->Resolve(serverName.c_str());
+              if (! CORBA::is_nil(obj))
+                {
+                  found =1;
+                  break; // server found, no more try to do
+                }
+              MESSAGE("Server "<< serverName <<" not yet ready, waiting...");
+#ifndef WIN32
+              nanosleep(&ts_req,&ts_rem); // wait before retry
+#else
+              Sleep(TIMESleep/1000000);
+#endif
+            }
+        }
       catch( ServiceUnreachable& )
-       {
-         MESSAGE("CORBA::COMM_FAILURE: Naming Service not yet ready, waiting...");
-         int a = nanosleep(&ts_req,&ts_rem); // wait before retry
-       }
+        {
+          MESSAGE("CORBA::COMM_FAILURE: Naming Service not yet ready, waiting...");
+#ifndef WIN32
+          nanosleep(&ts_req,&ts_rem); // wait before retry
+#else
+          Sleep(TIMESleep/1000000);
+#endif
+        }
     }
   if (!found)
     {