Changeset 2693

Timestamp:

12/16/24 10:00:44 (7 weeks ago)

Author:

jderouillat

Message:

When 2 levels servers are used, instanciate first writer, then gatherers. It avoids a deadlock situation in the case of services managed through a notification manager embedded on a server.

File:

• XIOS3/trunk/src/server.cpp (modified) (2 diffs)

XIOS3/trunk/src/server.cpp

@@ -262 +262 @@
               }
             else ressourcesManager->waitPoolRegistration(CXios::defaultPoolId) ;
-
-            servicesManager->createServices(CXios::defaultPoolId,  CXios::defaultGathererId, CServicesManager::GATHERER, nprocsGatherer, 1) ;
-            if (CThreadManager::isUsingThreads()) 
-              while(!servicesManager->hasService(CXios::defaultPoolId, CXios::defaultGathererId,0)) 
-              {
-                daemonsManager->eventLoop() ;
-                CThreadManager::yield() ;
-              }
-            else servicesManager->waitServiceRegistration(CXios::defaultPoolId, CXios::defaultGathererId) ;
-
-            servicesManager->createServicesOnto(CXios::defaultPoolId, CXios::defaultReaderId, CServicesManager::READER, CXios::defaultGathererId) ;
-            if (CThreadManager::isUsingThreads()) 
-              while(!servicesManager->hasService(CXios::defaultPoolId, CXios::defaultReaderId, 0)) 
-              {
-                daemonsManager->eventLoop() ;
-                CThreadManager::yield() ;
-              }
-            else servicesManager->waitServiceRegistration(CXios::defaultPoolId, CXios::defaultReaderId) ;
             
             servicesManager->createServices(CXios::defaultPoolId,  CXios::defaultWriterId, CServicesManager::WRITER, nprocsServer, nbPoolsServer2) ;
@@ -290 +272 @@
                 }
             else servicesManager->waitServiceRegistration(CXios::defaultPoolId, CXios::defaultWriterId) ;
+
+            servicesManager->createServices(CXios::defaultPoolId,  CXios::defaultGathererId, CServicesManager::GATHERER, nprocsGatherer, 1) ;
+            if (CThreadManager::isUsingThreads()) 
+              while(!servicesManager->hasService(CXios::defaultPoolId, CXios::defaultGathererId,0)) 
+              {
+                daemonsManager->eventLoop() ;
+                CThreadManager::yield() ;
+              }
+            else servicesManager->waitServiceRegistration(CXios::defaultPoolId, CXios::defaultGathererId) ;
+
+            servicesManager->createServicesOnto(CXios::defaultPoolId, CXios::defaultReaderId, CServicesManager::READER, CXios::defaultGathererId) ;
+            if (CThreadManager::isUsingThreads()) 
+              while(!servicesManager->hasService(CXios::defaultPoolId, CXios::defaultReaderId, 0)) 
+              {
+                daemonsManager->eventLoop() ;
+                CThreadManager::yield() ;
+              }
+            else servicesManager->waitServiceRegistration(CXios::defaultPoolId, CXios::defaultReaderId) ;
           }
         }