Changeset 1112:d87cee14b051 in freeDiameter

Timestamp:

May 13, 2013, 7:50:26 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Fix core termination sequence

File:

• libfdcore/core.c (modified) (4 diffs)

libfdcore/core.c

@@ -84 +84 @@
 static int core_state_wait(enum core_state waitstate)
 {
-        int ret;
+        int ret = 0;
         CHECK_POSIX( pthread_mutex_lock( &core_mtx ));
         pthread_cleanup_push( fd_cleanup_mutex, &core_mtx );
-        do {
+        while (waitstate > core_state) {
                 CHECK_POSIX_DO(ret = pthread_cond_wait(&core_cnd, &core_mtx), break);
-        } while (waitstate > core_state);
+        }
         pthread_cleanup_pop( 0 );
         CHECK_POSIX( pthread_mutex_unlock( &core_mtx ));
@@ -189 +189 @@
         }
         
-        LOG_D("libfdproto initialized.");
+        LOG_N("libfdproto initialized.");
         
         /* Name this thread */
@@ -305 +305 @@
         if (cur_state < CORE_RUNNING) {
                 core_shutdown();
+                core_state_set(CORE_TERM);
         } else if (cur_state == CORE_RUNNING) {
                 core_state_set(CORE_SHUTDOWN);
@@ -323 +324 @@
         void * th_ret = NULL;
         
+        CHECK_FCT(core_state_wait(CORE_SHUTDOWN));
+        
         if (cur_state == CORE_TERM)
                 return 0;
         
-        CHECK_FCT(core_state_wait(CORE_SHUTDOWN));
-        
         /* Just wait for core_runner_thread to complete and return gracefully */
         CHECK_POSIX(pthread_join(core_runner, &th_ret));