Changes in freeDiameter/p_expiry.c [25:67ca08d5bc48:16:013ce9851131] in freeDiameter

File:

• freeDiameter/p_expiry.c (modified) (6 diffs)

freeDiameter/p_expiry.c

@@ -47 +47 @@
 static void * gc_th_fct(void * arg)
 {
-        fd_log_threadname ( "Peers/garb. col." );
-        TRACE_ENTRY( "%p", arg );
+        fd_log_threadname ( "Peers/garbage" );
+        TRACE_ENTRY( "" );
         
         do {
                 struct fd_list * li, purge = FD_LIST_INITIALIZER(purge);
                 
-                sleep(GC_TIME); /* sleep is a cancellation point */
+                pthread_testcancel();
+                sleep(GC_TIME);
                 
                 /* Now check in the peers list if any peer can be deleted */
@@ -87 +88 @@
         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_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, NULL), );
         return NULL;
 }
@@ -95 +96 @@
 {
         fd_log_threadname ( "Peers/expire" );
-        TRACE_ENTRY( "%p", arg );
+        TRACE_ENTRY( "" );
         
         CHECK_POSIX_DO( pthread_mutex_lock(&exp_mtx),  goto error );
@@ -123 +124 @@
                         
                         CHECK_POSIX_DO2(  pthread_cond_timedwait( &exp_cnd, &exp_mtx, &first->p_exp_timer ),  
-                                        ETIMEDOUT, /* ETIMEDOUT is a normal return value, continue */,
+                                        ETIMEDOUT, /* ETIMEDOUT is a normal error, continue */,
                                         /* on other error, */ goto error );
         
@@ -132 +133 @@
                 /* Now, the first peer in the list is expired; signal it */
                 fd_list_unlink( &first->p_expiry );
-                CHECK_FCT_DO( fd_event_send(first->p_events, FDEVP_TERMINATE, 0, NULL), goto error );
+                CHECK_FCT_DO( fd_event_send(first->p_events, FDEVP_TERMINATE, NULL), goto error );
                 
         } while (1);
@@ -140 +141 @@
         TRACE_DEBUG(INFO, "An error occurred in peers module! Expiry 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_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, NULL), );
         return NULL;
 }