Changeset 1182:cc96a4dfb3d1 in freeDiameter for freeDiameterd

Timestamp:

Jun 6, 2013, 12:25:23 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Early shutdown situation: detect the race condition and delay the shutdown in freeDiameterd. Alternative would be to initialize in a separate thread that we can cancel before calling shutdown.

File:

• freeDiameterd/main.c (modified) (2 diffs)

freeDiameterd/main.c

@@ -87 +87 @@
         }
         
+        /* Parse the configuration file */
+        CHECK_FCT_DO( fd_core_parseconf(conffile), goto error );
+        
+        /* Start the servers */
+        CHECK_FCT_DO( fd_core_start(), goto error );
+        
         /* Allow SIGINT and SIGTERM from this point to terminate the application */
-        CHECK_POSIX( pthread_create(&signals_thr, NULL, catch_signals, NULL) );
-        
-        /* Parse the configuration file */
-        CHECK_FCT( fd_core_parseconf(conffile) );
-        
-        /* Start the servers */
-        CHECK_FCT( fd_core_start() );
+        CHECK_POSIX_DO( pthread_create(&signals_thr, NULL, catch_signals, NULL), goto error );
         
         TRACE_DEBUG(INFO, FD_PROJECT_BINARY " daemon initialized.");
-        
+
         /* Now, just wait for termination */
         CHECK_FCT( fd_core_wait_shutdown_complete() );
@@ -105 +105 @@
         
         return 0;
+error:  
+        CHECK_FCT_DO( fd_core_shutdown(),  );
+        CHECK_FCT( fd_core_wait_shutdown_complete() );
+        fd_thr_term(&signals_thr);
+        return -1;
 }