Changes in freeDiameter/p_expiry.c [16:013ce9851131:25:67ca08d5bc48] in freeDiameter
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
freeDiameter/p_expiry.c
r16 r25 47 47 static void * gc_th_fct(void * arg) 48 48 { 49 fd_log_threadname ( "Peers/garb age" );50 TRACE_ENTRY( " ");49 fd_log_threadname ( "Peers/garb. col." ); 50 TRACE_ENTRY( "%p", arg ); 51 51 52 52 do { 53 53 struct fd_list * li, purge = FD_LIST_INITIALIZER(purge); 54 54 55 pthread_testcancel(); 56 sleep(GC_TIME); 55 sleep(GC_TIME); /* sleep is a cancellation point */ 57 56 58 57 /* Now check in the peers list if any peer can be deleted */ … … 88 87 TRACE_DEBUG(INFO, "An error occurred in peers module! GC thread is terminating..."); 89 88 ASSERT(0); 90 CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, NULL), );89 CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), ); 91 90 return NULL; 92 91 } … … 96 95 { 97 96 fd_log_threadname ( "Peers/expire" ); 98 TRACE_ENTRY( " ");97 TRACE_ENTRY( "%p", arg ); 99 98 100 99 CHECK_POSIX_DO( pthread_mutex_lock(&exp_mtx), goto error ); … … 124 123 125 124 CHECK_POSIX_DO2( pthread_cond_timedwait( &exp_cnd, &exp_mtx, &first->p_exp_timer ), 126 ETIMEDOUT, /* ETIMEDOUT is a normal error, continue */,125 ETIMEDOUT, /* ETIMEDOUT is a normal return value, continue */, 127 126 /* on other error, */ goto error ); 128 127 … … 133 132 /* Now, the first peer in the list is expired; signal it */ 134 133 fd_list_unlink( &first->p_expiry ); 135 CHECK_FCT_DO( fd_event_send(first->p_events, FDEVP_TERMINATE, NULL), goto error );134 CHECK_FCT_DO( fd_event_send(first->p_events, FDEVP_TERMINATE, 0, NULL), goto error ); 136 135 137 136 } while (1); … … 141 140 TRACE_DEBUG(INFO, "An error occurred in peers module! Expiry thread is terminating..."); 142 141 ASSERT(0); 143 CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, NULL), );142 CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), ); 144 143 return NULL; 145 144 }
Note: See TracChangeset
for help on using the changeset viewer.