diff --git a/bin/tests/tasks/t_tasks.c b/bin/tests/tasks/t_tasks.c index dbb65d9278..d71dde5312 100644 --- a/bin/tests/tasks/t_tasks.c +++ b/bin/tests/tasks/t_tasks.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: t_tasks.c,v 1.44 2011/03/12 04:59:47 tbox Exp $ */ +/* $Id: t_tasks.c,v 1.45 2011/03/14 14:10:23 fdupont Exp $ */ #include @@ -733,7 +733,7 @@ t_tasks3(void) { if (isc_result != ISC_R_SUCCESS) { t_info("isc_task_create failed %s\n", isc_result_totext(isc_result)); - isc_mutex_unlock(&T3_mx); + (void) isc_mutex_unlock(&T3_mx); isc_taskmgr_destroy(&tmgr); isc_mem_destroy(&mctx); return(T_UNRESOLVED); @@ -762,7 +762,7 @@ t_tasks3(void) { if (isc_result != ISC_R_SUCCESS) { t_info("isc_task_send failed %s\n", isc_result_totext(isc_result)); - isc_mutex_unlock(&T3_mx); + (void) isc_mutex_unlock(&T3_mx); isc_task_destroy(&task); isc_taskmgr_destroy(&tmgr); isc_mem_destroy(&mctx); @@ -773,7 +773,7 @@ t_tasks3(void) { if (isc_result != ISC_R_SUCCESS) { t_info("isc_task_send failed %s\n", isc_result_totext(isc_result)); - isc_mutex_unlock(&T3_mx); + (void) isc_mutex_unlock(&T3_mx); isc_task_destroy(&task); isc_taskmgr_destroy(&tmgr); isc_mem_destroy(&mctx); @@ -810,11 +810,6 @@ t_tasks3(void) { ++T3_nfails; } - if (T3_nevents != T3_nevents) { - t_info("T3_nevents == %d, expected 2\n", T3_nevents); - ++T3_nfails; - } - result = T_UNRESOLVED; if (T3_nfails != 0) @@ -935,7 +930,7 @@ t_tasks4(void) { t_info("isc_taskmgr_create failed %s\n", isc_result_totext(isc_result)); DESTROYLOCK(&T4_mx); - isc_condition_destroy(&T4_cv); + (void) isc_condition_destroy(&T4_cv); isc_mem_destroy(&mctx); return(T_UNRESOLVED); } @@ -945,7 +940,7 @@ t_tasks4(void) { t_info("isc_mutex_lock failed %s\n", isc_result_totext(isc_result)); DESTROYLOCK(&T4_mx); - isc_condition_destroy(&T4_cv); + (void) isc_condition_destroy(&T4_cv); isc_taskmgr_destroy(&tmgr); isc_mem_destroy(&mctx); return(T_UNRESOLVED); @@ -957,7 +952,7 @@ t_tasks4(void) { t_info("isc_task_create failed %s\n", isc_result_totext(isc_result)); DESTROYLOCK(&T4_mx); - isc_condition_destroy(&T4_cv); + (void) isc_condition_destroy(&T4_cv); isc_taskmgr_destroy(&tmgr); isc_mem_destroy(&mctx); return(T_UNRESOLVED); @@ -1001,7 +996,7 @@ t_tasks4(void) { isc_task_detach(&task); isc_taskmgr_destroy(&tmgr); isc_mem_destroy(&mctx); - isc_condition_destroy(&T4_cv); + (void) isc_condition_destroy(&T4_cv); DESTROYLOCK(&T4_mx); result = T_UNRESOLVED; @@ -1134,7 +1129,7 @@ t_tasks7(void) { t_info("isc_taskmgr_create failed %s\n", isc_result_totext(isc_result)); DESTROYLOCK(&T7_mx); - isc_condition_destroy(&T7_cv); + (void) isc_condition_destroy(&T7_cv); isc_mem_destroy(&mctx); return(T_UNRESOLVED); } @@ -1144,7 +1139,7 @@ t_tasks7(void) { t_info("isc_mutex_lock failed %s\n", isc_result_totext(isc_result)); DESTROYLOCK(&T7_mx); - isc_condition_destroy(&T7_cv); + (void) isc_condition_destroy(&T7_cv); isc_taskmgr_destroy(&tmgr); isc_mem_destroy(&mctx); return(T_FAIL); @@ -1156,7 +1151,7 @@ t_tasks7(void) { t_info("isc_task_create failed %s\n", isc_result_totext(isc_result)); DESTROYLOCK(&T7_mx); - isc_condition_destroy(&T7_cv); + (void) isc_condition_destroy(&T7_cv); isc_taskmgr_destroy(&tmgr); isc_mem_destroy(&mctx); return(T_FAIL); @@ -1167,7 +1162,7 @@ t_tasks7(void) { t_info("isc_task_onshutdown returned %s\n", isc_result_totext(isc_result)); DESTROYLOCK(&T7_mx); - isc_condition_destroy(&T7_cv); + (void) isc_condition_destroy(&T7_cv); isc_task_destroy(&task); isc_taskmgr_destroy(&tmgr); isc_mem_destroy(&mctx); @@ -1189,7 +1184,7 @@ t_tasks7(void) { t_info("isc_time_nowplusinterval failed %s\n", isc_result_totext(isc_result)); DESTROYLOCK(&T7_mx); - isc_condition_destroy(&T7_cv); + (void) isc_condition_destroy(&T7_cv); isc_task_destroy(&task); isc_taskmgr_destroy(&tmgr); isc_mem_destroy(&mctx); @@ -1201,7 +1196,7 @@ t_tasks7(void) { t_info("isc_condition_waituntil returned %s\n", isc_result_totext(isc_result)); DESTROYLOCK(&T7_mx); - isc_condition_destroy(&T7_cv); + (void) isc_condition_destroy(&T7_cv); isc_task_destroy(&task); isc_taskmgr_destroy(&tmgr); isc_mem_destroy(&mctx); @@ -1219,7 +1214,7 @@ t_tasks7(void) { isc_task_detach(&task); isc_taskmgr_destroy(&tmgr); isc_mem_destroy(&mctx); - isc_condition_destroy(&T7_cv); + (void) isc_condition_destroy(&T7_cv); DESTROYLOCK(&T7_mx); result = T_UNRESOLVED; @@ -1463,7 +1458,7 @@ t_taskpurge_x(int sender, int type, int tag, void *purge_sender, isc_result_totext(isc_result)); isc_mem_destroy(&mctx); DESTROYLOCK(&T10_mx); - isc_condition_destroy(&T10_cv); + (void) isc_condition_destroy(&T10_cv); ++*nprobs; return; } @@ -1476,7 +1471,7 @@ t_taskpurge_x(int sender, int type, int tag, void *purge_sender, isc_taskmgr_destroy(&tmgr); isc_mem_destroy(&mctx); DESTROYLOCK(&T10_mx); - isc_condition_destroy(&T10_cv); + (void) isc_condition_destroy(&T10_cv); ++*nprobs; return; } @@ -1489,7 +1484,7 @@ t_taskpurge_x(int sender, int type, int tag, void *purge_sender, isc_taskmgr_destroy(&tmgr); isc_mem_destroy(&mctx); DESTROYLOCK(&T10_mx); - isc_condition_destroy(&T10_cv); + (void) isc_condition_destroy(&T10_cv); ++*nprobs; return; } @@ -1575,7 +1570,7 @@ t_taskpurge_x(int sender, int type, int tag, void *purge_sender, isc_taskmgr_destroy(&tmgr); isc_mem_destroy(&mctx); DESTROYLOCK(&T10_mx); - isc_condition_destroy(&T10_cv); + (void) isc_condition_destroy(&T10_cv); ++*nprobs; return; } @@ -1608,7 +1603,7 @@ t_taskpurge_x(int sender, int type, int tag, void *purge_sender, isc_taskmgr_destroy(&tmgr); isc_mem_destroy(&mctx); DESTROYLOCK(&T10_mx); - isc_condition_destroy(&T10_cv); + (void) isc_condition_destroy(&T10_cv); ++*nprobs; return; } @@ -1621,7 +1616,7 @@ t_taskpurge_x(int sender, int type, int tag, void *purge_sender, isc_taskmgr_destroy(&tmgr); isc_mem_destroy(&mctx); DESTROYLOCK(&T10_mx); - isc_condition_destroy(&T10_cv); + (void) isc_condition_destroy(&T10_cv); ++*nfails; return; } @@ -1638,7 +1633,7 @@ t_taskpurge_x(int sender, int type, int tag, void *purge_sender, isc_taskmgr_destroy(&tmgr); isc_mem_destroy(&mctx); DESTROYLOCK(&T10_mx); - isc_condition_destroy(&T10_cv); + (void) isc_condition_destroy(&T10_cv); if (T_debug) t_info("task processed %d events\n", T10_eventcnt); @@ -1855,7 +1850,7 @@ t_tasks11(int purgable) { isc_result_totext(isc_result)); isc_mem_destroy(&mctx); DESTROYLOCK(&T11_mx); - isc_condition_destroy(&T11_cv); + (void) isc_condition_destroy(&T11_cv); return(T_UNRESOLVED); } @@ -1867,7 +1862,7 @@ t_tasks11(int purgable) { isc_taskmgr_destroy(&tmgr); isc_mem_destroy(&mctx); DESTROYLOCK(&T11_mx); - isc_condition_destroy(&T11_cv); + (void) isc_condition_destroy(&T11_cv); return(T_UNRESOLVED); } @@ -1879,7 +1874,7 @@ t_tasks11(int purgable) { isc_taskmgr_destroy(&tmgr); isc_mem_destroy(&mctx); DESTROYLOCK(&T11_mx); - isc_condition_destroy(&T11_cv); + (void) isc_condition_destroy(&T11_cv); return(T_UNRESOLVED); } @@ -1962,7 +1957,7 @@ t_tasks11(int purgable) { isc_taskmgr_destroy(&tmgr); isc_mem_destroy(&mctx); DESTROYLOCK(&T11_mx); - isc_condition_destroy(&T11_cv); + (void) isc_condition_destroy(&T11_cv); if (T11_eventcnt != (purgable ? 0 : 1)) { t_info("Event was %s purged\n", diff --git a/bin/tests/timers/t_timers.c b/bin/tests/timers/t_timers.c index 2740e36311..13b3759f1d 100644 --- a/bin/tests/timers/t_timers.c +++ b/bin/tests/timers/t_timers.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: t_timers.c,v 1.32 2011/03/12 04:59:47 tbox Exp $ */ +/* $Id: t_timers.c,v 1.33 2011/03/14 14:13:10 fdupont Exp $ */ #include @@ -237,7 +237,7 @@ t_timers_x(isc_timertype_t timertype, isc_time_t *expires, t_info("isc_taskmgr_create failed %s\n", isc_result_totext(isc_result)); DESTROYLOCK(&Tx_mx); - isc_condition_destroy(&Tx_cv); + (void) isc_condition_destroy(&Tx_cv); isc_mem_destroy(&mctx); ++Tx_nprobs; return; @@ -250,7 +250,7 @@ t_timers_x(isc_timertype_t timertype, isc_time_t *expires, isc_result_totext(isc_result)); isc_taskmgr_destroy(&tmgr); DESTROYLOCK(&Tx_mx); - isc_condition_destroy(&Tx_cv); + (void) isc_condition_destroy(&Tx_cv); isc_mem_destroy(&mctx); ++Tx_nprobs; return; @@ -263,7 +263,7 @@ t_timers_x(isc_timertype_t timertype, isc_time_t *expires, isc_timermgr_destroy(&timermgr); isc_taskmgr_destroy(&tmgr); DESTROYLOCK(&Tx_mx); - isc_condition_destroy(&Tx_cv); + (void) isc_condition_destroy(&Tx_cv); isc_mem_destroy(&mctx); ++Tx_nprobs; return; @@ -277,7 +277,7 @@ t_timers_x(isc_timertype_t timertype, isc_time_t *expires, isc_timermgr_destroy(&timermgr); isc_taskmgr_destroy(&tmgr); DESTROYLOCK(&Tx_mx); - isc_condition_destroy(&Tx_cv); + (void) isc_condition_destroy(&Tx_cv); isc_mem_destroy(&mctx); ++Tx_nprobs; return; @@ -291,7 +291,7 @@ t_timers_x(isc_timertype_t timertype, isc_time_t *expires, isc_task_destroy(&task); isc_taskmgr_destroy(&tmgr); DESTROYLOCK(&Tx_mx); - isc_condition_destroy(&Tx_cv); + (void) isc_condition_destroy(&Tx_cv); isc_mem_destroy(&mctx); ++Tx_nprobs; return; @@ -303,7 +303,7 @@ t_timers_x(isc_timertype_t timertype, isc_time_t *expires, isc_task_destroy(&task); isc_taskmgr_destroy(&tmgr); DESTROYLOCK(&Tx_mx); - isc_condition_destroy(&Tx_cv); + (void) isc_condition_destroy(&Tx_cv); isc_mem_destroy(&mctx); ++Tx_nprobs; return; @@ -319,7 +319,7 @@ t_timers_x(isc_timertype_t timertype, isc_time_t *expires, isc_task_destroy(&task); isc_taskmgr_destroy(&tmgr); DESTROYLOCK(&Tx_mx); - isc_condition_destroy(&Tx_cv); + (void) isc_condition_destroy(&Tx_cv); isc_mem_destroy(&mctx); ++Tx_nprobs; return; @@ -348,7 +348,7 @@ t_timers_x(isc_timertype_t timertype, isc_time_t *expires, isc_taskmgr_destroy(&tmgr); isc_timermgr_destroy(&timermgr); DESTROYLOCK(&Tx_mx); - isc_condition_destroy(&Tx_cv); + (void) isc_condition_destroy(&Tx_cv); isc_mem_destroy(&mctx); } @@ -929,7 +929,7 @@ t_timers5(void) { t_info("isc_taskmgr_create failed %s\n", isc_result_totext(isc_result)); DESTROYLOCK(&T5_mx); - isc_condition_destroy(&T5_cv); + (void) isc_condition_destroy(&T5_cv); isc_mem_destroy(&mctx); return(T_UNRESOLVED); } @@ -941,7 +941,7 @@ t_timers5(void) { isc_result_totext(isc_result)); isc_taskmgr_destroy(&tmgr); DESTROYLOCK(&T5_mx); - isc_condition_destroy(&T5_cv); + (void) isc_condition_destroy(&T5_cv); isc_mem_destroy(&mctx); return(T_UNRESOLVED); } @@ -954,7 +954,7 @@ t_timers5(void) { isc_timermgr_destroy(&timermgr); isc_taskmgr_destroy(&tmgr); DESTROYLOCK(&T5_mx); - isc_condition_destroy(&T5_cv); + (void) isc_condition_destroy(&T5_cv); isc_mem_destroy(&mctx); return(T_UNRESOLVED); } @@ -967,7 +967,7 @@ t_timers5(void) { isc_task_destroy(&T5_task1); isc_taskmgr_destroy(&tmgr); DESTROYLOCK(&T5_mx); - isc_condition_destroy(&T5_cv); + (void) isc_condition_destroy(&T5_cv); isc_mem_destroy(&mctx); return(T_UNRESOLVED); } @@ -981,7 +981,7 @@ t_timers5(void) { isc_task_destroy(&T5_task1); isc_taskmgr_destroy(&tmgr); DESTROYLOCK(&T5_mx); - isc_condition_destroy(&T5_cv); + (void) isc_condition_destroy(&T5_cv); isc_mem_destroy(&mctx); return(T_UNRESOLVED); } @@ -993,7 +993,7 @@ t_timers5(void) { isc_timermgr_destroy(&timermgr); isc_taskmgr_destroy(&tmgr); DESTROYLOCK(&T5_mx); - isc_condition_destroy(&T5_cv); + (void) isc_condition_destroy(&T5_cv); isc_mem_destroy(&mctx); return(T_UNRESOLVED); } @@ -1018,7 +1018,7 @@ t_timers5(void) { isc_task_destroy(&T5_task2); isc_taskmgr_destroy(&tmgr); DESTROYLOCK(&T5_mx); - isc_condition_destroy(&T5_cv); + (void) isc_condition_destroy(&T5_cv); isc_mem_destroy(&mctx); return(T_UNRESOLVED); } @@ -1035,7 +1035,7 @@ t_timers5(void) { isc_task_destroy(&T5_task2); isc_taskmgr_destroy(&tmgr); DESTROYLOCK(&T5_mx); - isc_condition_destroy(&T5_cv); + (void) isc_condition_destroy(&T5_cv); isc_mem_destroy(&mctx); return(T_UNRESOLVED); } @@ -1054,7 +1054,7 @@ t_timers5(void) { isc_task_destroy(&T5_task2); isc_taskmgr_destroy(&tmgr); DESTROYLOCK(&T5_mx); - isc_condition_destroy(&T5_cv); + (void) isc_condition_destroy(&T5_cv); isc_mem_destroy(&mctx); ++T5_nprobs; return(T_UNRESOLVED); @@ -1091,7 +1091,7 @@ t_timers5(void) { isc_task_destroy(&T5_task2); isc_taskmgr_destroy(&tmgr); DESTROYLOCK(&T5_mx); - isc_condition_destroy(&T5_cv); + (void) isc_condition_destroy(&T5_cv); isc_mem_destroy(&mctx); result = T_UNRESOLVED;