Changeset 686:f83d9878bf66 in freeDiameter for libfdcore/routing_dispatch.c

Timestamp:

Jan 19, 2011, 2:35:14 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Fixed in case of termination of several modules (before initialization completed)

File:

• libfdcore/routing_dispatch.c (modified) (6 diffs)

libfdcore/routing_dispatch.c

@@ -973 +973 @@
 
 /* Threads report their status */
-enum thread_state { INITIAL = 0, RUNNING = 1, TERMINATED = 2 };
+enum thread_state { NOTRUNNING = 0, RUNNING = 1 };
 static void cleanup_state(void * state_loc)
 {
         if (state_loc)
-                *(enum thread_state *)state_loc = TERMINATED;
+                *(enum thread_state *)state_loc = NOTRUNNING;
 }
 
@@ -1080 +1080 @@
 /* Later: make this more dynamic */
 static pthread_t rt_out = (pthread_t)NULL;
-static enum thread_state out_state = INITIAL;
+static enum thread_state out_state = NOTRUNNING;
 
 static pthread_t rt_in  = (pthread_t)NULL;
-static enum thread_state in_state = INITIAL;
+static enum thread_state in_state = NOTRUNNING;
 
 /* Initialize the routing and dispatch threads */
@@ -1091 +1091 @@
         
         /* Prepare the array for dispatch */
+        CHECK_MALLOC( disp_state = calloc(fd_g_config->cnf_dispthr, sizeof(enum thread_state)) );
         CHECK_MALLOC( dispatch = calloc(fd_g_config->cnf_dispthr, sizeof(pthread_t)) );
-        CHECK_MALLOC( disp_state = calloc(fd_g_config->cnf_dispthr, sizeof(enum thread_state)) );
         
         /* Create the threads */
@@ -1126 +1126 @@
         /* Wait for a second for the thread to complete, by monitoring my_state */
         fd_cpu_flush_cache();
-        if (*st != TERMINATED) {
+        if (*st != NOTRUNNING) {
                 TRACE_DEBUG(INFO, "Waiting for the %s thread to have a chance to terminate", th_name);
                 do {
@@ -1137 +1137 @@
                         
                         while (TS_IS_INFERIOR( &ts, &ts_final )) {
-                                if (*st == TERMINATED)
+                                fd_cpu_flush_cache();
+                                if (*st == NOTRUNNING)
                                         break;
                                 
@@ -1171 +1172 @@
         CHECK_FCT_DO( fd_queues_fini(&fd_g_local), /* ignore */);
         
-        /* Stop the Dispatch thread */
-        for (i=0; i < fd_g_config->cnf_dispthr; i++) {
-                stop_thread_delayed(&disp_state[i], &dispatch[i], "Dispatching");
+        /* Stop the Dispatch threads */
+        if (dispatch != NULL) {
+                for (i=0; i < fd_g_config->cnf_dispthr; i++) {
+                        stop_thread_delayed(&disp_state[i], &dispatch[i], "Dispatching");
+                }
+                free(dispatch);
+                dispatch = NULL;
+        }
+        if (disp_state != NULL) {
+                free(disp_state);
+                disp_state = NULL;
         }