Changeset 1190:6a1042d8075b in freeDiameter

Timestamp:

Jun 10, 2013, 5:44:18 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Replace FDEV_TERMINATE events with calls to fd_core_shutdown to handle the core state properly

Files:

• extensions/app_radgw/rgw_clients.c (modified) (1 diff)
• extensions/test_netemul/tne_process.c (modified) (1 diff)
• include/freeDiameter/libfdcore.h (modified) (1 diff)
• libfdcore/cnxctx.c (modified) (5 diffs)
• libfdcore/core.c (modified) (3 diffs)
• libfdcore/events.c (modified) (1 diff)
• libfdcore/p_cnx.c (modified) (1 diff)
• libfdcore/p_expiry.c (modified) (2 diffs)
• libfdcore/routing_dispatch.c (modified) (1 diff)
• libfdcore/sctp3436.c (modified) (1 diff)
• libfdcore/server.c (modified) (1 diff)

extensions/app_radgw/rgw_clients.c

@@ -204 +204 @@
         
         /* If we reach this part, some fatal error was encountered */
-        CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), );
+        CHECK_FCT_DO(fd_core_shutdown(), );
         TRACE_DEBUG(FULL, "Thread terminated"); 
         return NULL;

extensions/test_netemul/tne_process.c

@@ -281 +281 @@
         TRACE_DEBUG(INFO, "A fatal error occurred in test_netemul/process thread!");
         ASSERT(0);
-        CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), );
+        CHECK_FCT_DO(fd_core_shutdown(), );
         return NULL;
 }

include/freeDiameter/libfdcore.h

@@ -813 +813 @@
 /* Daemon's codespace: 1000->1999 (1500->1999 defined in fdcore-internal.h) */
 enum {
-         FDEV_TERMINATE = 1000  /* request to terminate */
-        ,FDEV_TRIGGER           /* Trigger available for extensions. size is sizeof(int), data is int * */
+         FDEV_TERMINATE_INT= 1000       /* request to terminate. DO NOT USE. Use fd_core_shutdown() instead.  */
+        ,FDEV_TRIGGER                   /* Trigger available for extensions. size is sizeof(int), data is int * */
 };
 

libfdcore/cnxctx.c

@@ -611 +611 @@
         /* An unrecoverable error occurred, stop the daemon */
         ASSERT(0);
-        CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), );       
+        CHECK_FCT_DO(fd_core_shutdown(), );     
 }
 
@@ -843 +843 @@
                         { 
                                 free_rcvdata(&rcv_data);
-                                CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), );
-                                return NULL; 
+                                goto fatal; 
                         } );
                 
@@ -855 +854 @@
 fatal:
         /* An unrecoverable error occurred, stop the daemon */
-        CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), );
+        CHECK_FCT_DO(fd_core_shutdown(), );
         goto out;
 }
@@ -908 +907 @@
 fatal:
         /* An unrecoverable error occurred, stop the daemon */
-        CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), );
+        CHECK_FCT_DO(fd_core_shutdown(), );
         goto out;
 }
@@ -1099 +1098 @@
                         { 
                                 free_rcvdata(&rcv_data);
-                                CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), );
+                                CHECK_FCT_DO(fd_core_shutdown(), );
                                 return ret; 
                         } );

libfdcore/core.c

@@ -149 +149 @@
                                 break;
                         
-                        case FDEV_TERMINATE:
+                        case FDEV_TERMINATE_INT:
                                 goto end;
                         
@@ -327 +327 @@
         enum core_state cur_state = core_state_get();
         
+        LOG_F("Initiating freeDiameter shutdown sequence (%d)", cur_state);
+                
         if (cur_state < CORE_RUNNING) {
                 /* Calling application must make sure the initialization is not ongoing in a separate thread... */
@@ -339 +341 @@
         } else if (cur_state == CORE_RUNNING) {
                 core_state_set(CORE_SHUTDOWN);
-                CHECK_FCT( fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL) );
+                CHECK_FCT( fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE_INT, 0, NULL) );
         }
         

libfdcore/events.c

@@ -105 +105 @@
         #define case_str( _val )\
                 case _val : return #_val
-                case_str(FDEV_TERMINATE);
+                case_str(FDEV_TERMINATE_INT);
                 case_str(FDEV_TRIGGER);
                 

libfdcore/p_cnx.c

@@ -314 +314 @@
 
                 /* Generate a termination event */
-                CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), );
+                CHECK_FCT_DO(fd_core_shutdown(), );
         }
         

libfdcore/p_expiry.c

@@ -87 +87 @@
         TRACE_DEBUG(INFO, "An error occurred in peers module! GC thread is terminating...");
         ASSERT(0);
-        CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), );
+        CHECK_FCT_DO(fd_core_shutdown(), );
         return NULL;
 }
@@ -139 +139 @@
 
         TRACE_DEBUG(INFO, "An error occurred in peers module! Expiry thread is terminating...");
-        CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), );
+        CHECK_FCT_DO(fd_core_shutdown(), );
         return NULL;
 }

libfdcore/routing_dispatch.c

@@ -1115 +1115 @@
 fatal_error:
         TRACE_DEBUG(INFO, "An unrecoverable error occurred, %s thread is terminating...", action_name);
-        CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), );
+        CHECK_FCT_DO(fd_core_shutdown(), );
         
 end:    

libfdcore/sctp3436.c

@@ -130 +130 @@
 fatal:
         /* An unrecoverable error occurred, stop the daemon */
-        CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), );
+        CHECK_FCT_DO(fd_core_shutdown(), );
         goto out;
 }

libfdcore/server.c

@@ -304 +304 @@
         /* Send error signal to the core */
         LOG_F( "An error occurred in server module! Thread is terminating...");
-        CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), );
+        CHECK_FCT_DO(fd_core_shutdown(), );
 
         return NULL;