Changeset 1182:cc96a4dfb3d1 in freeDiameter

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.

Files:

• freeDiameterd/main.c (modified) (2 diffs)
• libfdcore/core.c (modified) (5 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;
 }
 

libfdcore/core.c

@@ -228 +228 @@
 }
 
+static pthread_mutex_t core_lock = PTHREAD_MUTEX_INITIALIZER;
+
 /* Parse the freeDiameter.conf configuration file, load the extensions */
-int fd_core_parseconf(const char * conffile)
+static int fd_core_parseconf_int(const char * conffile)
 {
         char * buf = NULL, *b;
@@ -274 +276 @@
 }
 
+int fd_core_parseconf(const char * conffile)
+{
+        int ret;
+        CHECK_POSIX( pthread_mutex_lock(&core_lock) );
+        ret = fd_core_parseconf_int(conffile);
+        CHECK_POSIX( pthread_mutex_unlock(&core_lock) );
+        return ret;
+}
+
+
 /* For threads that would need to wait complete start of the framework (ex: in extensions) */
 int fd_core_waitstartcomplete(void)
@@ -283 +295 @@
 
 /* Start the server & client threads */
-int fd_core_start(void)
+static int fd_core_start_int(void)
 {
         /* Start server threads */ 
@@ -301 +313 @@
 }
 
+int fd_core_start(void)
+{
+        int ret;
+        CHECK_POSIX( pthread_mutex_lock(&core_lock) );
+        ret = fd_core_start_int();
+        CHECK_POSIX( pthread_mutex_unlock(&core_lock) );
+        return ret;
+}
 
 /* Initialize shutdown of the framework. This is not blocking. */
@@ -308 +328 @@
         
         if (cur_state < CORE_RUNNING) {
+                /* Calling application must make sure the initialization is not ongoing in a separate thread... */
+                if (pthread_mutex_lock(&core_lock) != 0) {
+                        /* This function must not be called asynchronously from fd_core_parseconf / fd_core_start ! Please review your main app design */
+                        ASSERT(0);
+                        return EINVAL;
+                }
                 core_shutdown();
                 core_state_set(CORE_TERM);
+                pthread_mutex_unlock(&core_lock);
         } else if (cur_state == CORE_RUNNING) {
                 core_state_set(CORE_SHUTDOWN);