PR: relax start timers everywhere to 40x500ms = 20s

diff --git a/bin/orbmodule.py b/bin/orbmodule.py
index a96bc98474421374d75f781c0d150a8916c83177..a7cc2a2eb6845f70680c36b0da5af66858fc17d0 100755 (executable)
--- a/bin/orbmodule.py
+++ b/bin/orbmodule.py
@@ -118,9 +118,9 @@ class client:
 
    # --------------------------------------------------------------------------
 
-   def waitNS(self,name,typobj=None,maxcount=70):
+   def waitNS(self,name,typobj=None,maxcount=40):
       count=0
-      delta=0.3
+      delta=0.5
       print "Searching %s in Naming Service " % name,
       while(1):
           count += 1
@@ -161,9 +161,9 @@ class client:
    
    # --------------------------------------------------------------------------
 
-   def waitLogger(self,name,typobj=None,maxcount=10):
+   def waitLogger(self,name,typobj=None,maxcount=40):
       count=0
-      delta=0.3
+      delta=0.5
       print "Searching %s in Naming Service " % name,
       while(1):
           count += 1

diff --git a/src/Container/SALOME_Container.cxx b/src/Container/SALOME_Container.cxx
index 77904cbe09ac6c42f7a44fa9b0fd26fcf09ca44f..dfd501e9ff11bc86d1c7747f82808b5c728d1a76 100644 (file)
--- a/src/Container/SALOME_Container.cxx
+++ b/src/Container/SALOME_Container.cxx
@@ -74,7 +74,7 @@ int main(int argc, char* argv[])
     // Obtain a reference to the root POA.
     // obtain the root poa manager
     //
-    long TIMESleep = 250000000;
+    long TIMESleep = 500000000;
     int NumberOfTries = 40;
     int a;
     timespec ts_req;

diff --git a/src/Logger/SALOME_Logger_Server.cxx b/src/Logger/SALOME_Logger_Server.cxx
index df2cd8a1cc3bea72ef69e09719193e1c0ad1108c..f4b6fd53b3d7c6d4f4cc59db87df950c050d9197 100644 (file)
--- a/src/Logger/SALOME_Logger_Server.cxx
+++ b/src/Logger/SALOME_Logger_Server.cxx
@@ -67,7 +67,7 @@ int main(int argc, char **argv)
   try
     {
       //Initialize the ORB
-      const long TIMESleep = 250000000;
+      const long TIMESleep = 500000000;
       const int NumberOfTries = 40;
       int i;
       timespec ts_req = {0, TIMESleep};

diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx
index 9a5fb15ce66863b288c6bf55a43b56a79ab951c6..ad8cdd43dee065c66351dfab412b57f61f41c811 100644 (file)
--- a/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx
+++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx
@@ -48,7 +48,7 @@ int main(int argc,char **argv)
 
       // initialize POA
       //
-      long TIMESleep = 250000000;
+      long TIMESleep = 500000000;
       int NumberOfTries = 40;
       int a;
       timespec ts_req;

diff --git a/src/NamingService/NamingService_WaitForServerReadiness.cxx b/src/NamingService/NamingService_WaitForServerReadiness.cxx
index b2ba19a51cd3112fca81740f26ba0a5636b1b25d..7cb1a6bce9dafd1f889274d554bb8fcd2c985548 100644 (file)
--- a/src/NamingService/NamingService_WaitForServerReadiness.cxx
+++ b/src/NamingService/NamingService_WaitForServerReadiness.cxx
@@ -37,7 +37,7 @@ using namespace std;
  * \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.
@@ -48,8 +48,8 @@ using namespace std;
 void NamingService_WaitForServerReadiness(SALOME_NamingService* NS,
                                          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;

diff --git a/src/SALOMEDS/SALOMEDS_Server.cxx b/src/SALOMEDS/SALOMEDS_Server.cxx
index b0e8863bd48be5bf4c4b3ae6ea2603f3d1404ac6..70919bba0ca431d2d28d824fbb3e715d9968f758 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_Server.cxx
+++ b/src/SALOMEDS/SALOMEDS_Server.cxx
@@ -57,7 +57,7 @@ int main(int argc, char** argv)
       omniORB::MaxMessageSize(100 * 1024 * 1024);
       // Obtain a reference to the root POA.
       //
-      long TIMESleep = 250000000;
+      long TIMESleep = 500000000;
       int NumberOfTries = 40;
       int a;
       timespec ts_req;