use DESTROYLOCK()

This commit is contained in:
Brian Wellington 2000-08-30 01:35:42 +00:00
parent 743add946b
commit bf7c02293f
5 changed files with 53 additions and 53 deletions

View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: mempool_test.c,v 1.10 2000/08/01 01:13:01 tale Exp $ */
/* $Id: mempool_test.c,v 1.11 2000/08/30 01:35:37 bwelling Exp $ */
#include <config.h>
@ -122,7 +122,7 @@ main(int argc, char *argv[]) {
isc_mem_destroy(&mctx);
(void)isc_mutex_destroy(&lock);
DESTROYLOCK(&lock);
return (0);
}

View file

@ -289,7 +289,7 @@ main(int argc, char *argv[]) {
isc_mem_stats(mctx, stdout);
isc_mem_destroy(&mctx);
isc_mutex_destroy(&lock);
DESTROYLOCK(&lock);
isc_app_finish();

View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: t_tasks.c,v 1.18 2000/08/01 01:17:34 tale Exp $ */
/* $Id: t_tasks.c,v 1.19 2000/08/30 01:35:41 bwelling Exp $ */
#include <config.h>
@ -908,7 +908,7 @@ t_tasks4(void) {
if (isc_result != ISC_R_SUCCESS) {
t_info("isc_condition_init failed %s\n",
isc_result_totext(isc_result));
isc_mutex_destroy(&T4_mx);
DESTROYLOCK(&T4_mx);
isc_mem_destroy(&mctx);
return(T_UNRESOLVED);
}
@ -918,7 +918,7 @@ t_tasks4(void) {
if (isc_result != ISC_R_SUCCESS) {
t_info("isc_taskmgr_create failed %s\n",
isc_result_totext(isc_result));
isc_mutex_destroy(&T4_mx);
DESTROYLOCK(&T4_mx);
isc_condition_destroy(&T4_cv);
isc_mem_destroy(&mctx);
return(T_UNRESOLVED);
@ -928,7 +928,7 @@ t_tasks4(void) {
if (isc_result != ISC_R_SUCCESS) {
t_info("isc_mutex_lock failed %s\n",
isc_result_totext(isc_result));
isc_mutex_destroy(&T4_mx);
DESTROYLOCK(&T4_mx);
isc_condition_destroy(&T4_cv);
isc_taskmgr_destroy(&tmgr);
isc_mem_destroy(&mctx);
@ -940,7 +940,7 @@ t_tasks4(void) {
if (isc_result != ISC_R_SUCCESS) {
t_info("isc_task_create failed %s\n",
isc_result_totext(isc_result));
isc_mutex_destroy(&T4_mx);
DESTROYLOCK(&T4_mx);
isc_condition_destroy(&T4_cv);
isc_taskmgr_destroy(&tmgr);
isc_mem_destroy(&mctx);
@ -986,7 +986,7 @@ t_tasks4(void) {
isc_taskmgr_destroy(&tmgr);
isc_mem_destroy(&mctx);
isc_condition_destroy(&T4_cv);
isc_mutex_destroy(&T4_mx);
DESTROYLOCK(&T4_mx);
result = T_UNRESOLVED;
@ -1109,7 +1109,7 @@ t_tasks7(void) {
if (isc_result != ISC_R_SUCCESS) {
t_info("isc_condition_init failed %s\n",
isc_result_totext(isc_result));
isc_mutex_destroy(&T7_mx);
DESTROYLOCK(&T7_mx);
isc_mem_destroy(&mctx);
return(T_UNRESOLVED);
}
@ -1119,7 +1119,7 @@ t_tasks7(void) {
if (isc_result != ISC_R_SUCCESS) {
t_info("isc_taskmgr_create failed %s\n",
isc_result_totext(isc_result));
isc_mutex_destroy(&T7_mx);
DESTROYLOCK(&T7_mx);
isc_condition_destroy(&T7_cv);
isc_mem_destroy(&mctx);
return(T_UNRESOLVED);
@ -1129,7 +1129,7 @@ t_tasks7(void) {
if (isc_result != ISC_R_SUCCESS) {
t_info("isc_mutex_lock failed %s\n",
isc_result_totext(isc_result));
isc_mutex_destroy(&T7_mx);
DESTROYLOCK(&T7_mx);
isc_condition_destroy(&T7_cv);
isc_taskmgr_destroy(&tmgr);
isc_mem_destroy(&mctx);
@ -1141,7 +1141,7 @@ t_tasks7(void) {
if (isc_result != ISC_R_SUCCESS) {
t_info("isc_task_create failed %s\n",
isc_result_totext(isc_result));
isc_mutex_destroy(&T7_mx);
DESTROYLOCK(&T7_mx);
isc_condition_destroy(&T7_cv);
isc_taskmgr_destroy(&tmgr);
isc_mem_destroy(&mctx);
@ -1152,7 +1152,7 @@ t_tasks7(void) {
if (isc_result != ISC_R_SUCCESS) {
t_info("isc_task_onshutdown returned %s\n",
isc_result_totext(isc_result));
isc_mutex_destroy(&T7_mx);
DESTROYLOCK(&T7_mx);
isc_condition_destroy(&T7_cv);
isc_task_destroy(&task);
isc_taskmgr_destroy(&tmgr);
@ -1174,7 +1174,7 @@ t_tasks7(void) {
if (isc_result != ISC_R_SUCCESS) {
t_info("isc_time_nowplusinterval failed %s\n",
isc_result_totext(isc_result));
isc_mutex_destroy(&T7_mx);
DESTROYLOCK(&T7_mx);
isc_condition_destroy(&T7_cv);
isc_task_destroy(&task);
isc_taskmgr_destroy(&tmgr);
@ -1186,7 +1186,7 @@ t_tasks7(void) {
if (isc_result != ISC_R_SUCCESS) {
t_info("isc_condition_waituntil returned %s\n",
isc_result_totext(isc_result));
isc_mutex_destroy(&T7_mx);
DESTROYLOCK(&T7_mx);
isc_condition_destroy(&T7_cv);
isc_task_destroy(&task);
isc_taskmgr_destroy(&tmgr);
@ -1206,7 +1206,7 @@ t_tasks7(void) {
isc_taskmgr_destroy(&tmgr);
isc_mem_destroy(&mctx);
isc_condition_destroy(&T7_cv);
isc_mutex_destroy(&T7_mx);
DESTROYLOCK(&T7_mx);
result = T_UNRESOLVED;
@ -1436,7 +1436,7 @@ t_taskpurge_x(int sender, int type, int tag, int purge_sender,
t_info("isc_condition_init failed %s\n",
isc_result_totext(isc_result));
isc_mem_destroy(&mctx);
isc_mutex_destroy(&T10_mx);
DESTROYLOCK(&T10_mx);
++*nprobs;
return;
}
@ -1447,7 +1447,7 @@ t_taskpurge_x(int sender, int type, int tag, int purge_sender,
t_info("isc_taskmgr_create failed %s\n",
isc_result_totext(isc_result));
isc_mem_destroy(&mctx);
isc_mutex_destroy(&T10_mx);
DESTROYLOCK(&T10_mx);
isc_condition_destroy(&T10_cv);
++*nprobs;
return;
@ -1460,7 +1460,7 @@ t_taskpurge_x(int sender, int type, int tag, int purge_sender,
isc_result_totext(isc_result));
isc_taskmgr_destroy(&tmgr);
isc_mem_destroy(&mctx);
isc_mutex_destroy(&T10_mx);
DESTROYLOCK(&T10_mx);
isc_condition_destroy(&T10_cv);
++*nprobs;
return;
@ -1473,7 +1473,7 @@ t_taskpurge_x(int sender, int type, int tag, int purge_sender,
isc_task_destroy(&task);
isc_taskmgr_destroy(&tmgr);
isc_mem_destroy(&mctx);
isc_mutex_destroy(&T10_mx);
DESTROYLOCK(&T10_mx);
isc_condition_destroy(&T10_cv);
++*nprobs;
return;
@ -1559,7 +1559,7 @@ t_taskpurge_x(int sender, int type, int tag, int purge_sender,
isc_task_destroy(&task);
isc_taskmgr_destroy(&tmgr);
isc_mem_destroy(&mctx);
isc_mutex_destroy(&T10_mx);
DESTROYLOCK(&T10_mx);
isc_condition_destroy(&T10_cv);
++*nprobs;
return;
@ -1592,7 +1592,7 @@ t_taskpurge_x(int sender, int type, int tag, int purge_sender,
isc_task_detach(&task);
isc_taskmgr_destroy(&tmgr);
isc_mem_destroy(&mctx);
isc_mutex_destroy(&T10_mx);
DESTROYLOCK(&T10_mx);
isc_condition_destroy(&T10_cv);
++*nprobs;
return;
@ -1605,7 +1605,7 @@ t_taskpurge_x(int sender, int type, int tag, int purge_sender,
isc_task_detach(&task);
isc_taskmgr_destroy(&tmgr);
isc_mem_destroy(&mctx);
isc_mutex_destroy(&T10_mx);
DESTROYLOCK(&T10_mx);
isc_condition_destroy(&T10_cv);
++*nfails;
return;
@ -1622,7 +1622,7 @@ t_taskpurge_x(int sender, int type, int tag, int purge_sender,
isc_task_detach(&task);
isc_taskmgr_destroy(&tmgr);
isc_mem_destroy(&mctx);
isc_mutex_destroy(&T10_mx);
DESTROYLOCK(&T10_mx);
isc_condition_destroy(&T10_cv);
if (T_debug)
@ -1827,7 +1827,7 @@ t_tasks11(int purgable) {
t_info("isc_condition_init failed %s\n",
isc_result_totext(isc_result));
isc_mem_destroy(&mctx);
isc_mutex_destroy(&T11_mx);
DESTROYLOCK(&T11_mx);
return(T_UNRESOLVED);
}
@ -1837,7 +1837,7 @@ t_tasks11(int purgable) {
t_info("isc_taskmgr_create failed %s\n",
isc_result_totext(isc_result));
isc_mem_destroy(&mctx);
isc_mutex_destroy(&T11_mx);
DESTROYLOCK(&T11_mx);
isc_condition_destroy(&T11_cv);
return(T_UNRESOLVED);
}
@ -1849,7 +1849,7 @@ t_tasks11(int purgable) {
isc_result_totext(isc_result));
isc_taskmgr_destroy(&tmgr);
isc_mem_destroy(&mctx);
isc_mutex_destroy(&T11_mx);
DESTROYLOCK(&T11_mx);
isc_condition_destroy(&T11_cv);
return(T_UNRESOLVED);
}
@ -1861,7 +1861,7 @@ t_tasks11(int purgable) {
isc_task_destroy(&task);
isc_taskmgr_destroy(&tmgr);
isc_mem_destroy(&mctx);
isc_mutex_destroy(&T11_mx);
DESTROYLOCK(&T11_mx);
isc_condition_destroy(&T11_cv);
return(T_UNRESOLVED);
}
@ -1944,7 +1944,7 @@ t_tasks11(int purgable) {
isc_task_detach(&task);
isc_taskmgr_destroy(&tmgr);
isc_mem_destroy(&mctx);
isc_mutex_destroy(&T11_mx);
DESTROYLOCK(&T11_mx);
isc_condition_destroy(&T11_cv);
if (T11_eventcnt != (purgable ? 0 : 1)) {

View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: t_timers.c,v 1.14 2000/08/01 01:17:37 tale Exp $ */
/* $Id: t_timers.c,v 1.15 2000/08/30 01:35:42 bwelling Exp $ */
#include <config.h>
@ -211,7 +211,7 @@ t_timers_x(isc_timertype_t timertype, isc_time_t *expires,
if (isc_result != ISC_R_SUCCESS) {
t_info("isc_condition_init failed %s\n",
isc_result_totext(isc_result));
isc_mutex_destroy(&Tx_mx);
DESTROYLOCK(&Tx_mx);
isc_mem_destroy(&mctx);
++Tx_nprobs;
return;
@ -222,7 +222,7 @@ t_timers_x(isc_timertype_t timertype, isc_time_t *expires,
if (isc_result != ISC_R_SUCCESS) {
t_info("isc_taskmgr_create failed %s\n",
isc_result_totext(isc_result));
isc_mutex_destroy(&Tx_mx);
DESTROYLOCK(&Tx_mx);
isc_condition_destroy(&Tx_cv);
isc_mem_destroy(&mctx);
++Tx_nprobs;
@ -235,7 +235,7 @@ t_timers_x(isc_timertype_t timertype, isc_time_t *expires,
t_info("isc_timermgr_create failed %s\n",
isc_result_totext(isc_result));
isc_taskmgr_destroy(&tmgr);
isc_mutex_destroy(&Tx_mx);
DESTROYLOCK(&Tx_mx);
isc_condition_destroy(&Tx_cv);
isc_mem_destroy(&mctx);
++Tx_nprobs;
@ -248,7 +248,7 @@ t_timers_x(isc_timertype_t timertype, isc_time_t *expires,
isc_result_totext(isc_result));
isc_timermgr_destroy(&timermgr);
isc_taskmgr_destroy(&tmgr);
isc_mutex_destroy(&Tx_mx);
DESTROYLOCK(&Tx_mx);
isc_condition_destroy(&Tx_cv);
isc_mem_destroy(&mctx);
++Tx_nprobs;
@ -262,7 +262,7 @@ t_timers_x(isc_timertype_t timertype, isc_time_t *expires,
isc_result_totext(isc_result));
isc_timermgr_destroy(&timermgr);
isc_taskmgr_destroy(&tmgr);
isc_mutex_destroy(&Tx_mx);
DESTROYLOCK(&Tx_mx);
isc_condition_destroy(&Tx_cv);
isc_mem_destroy(&mctx);
++Tx_nprobs;
@ -276,7 +276,7 @@ t_timers_x(isc_timertype_t timertype, isc_time_t *expires,
isc_timermgr_destroy(&timermgr);
isc_task_destroy(&task);
isc_taskmgr_destroy(&tmgr);
isc_mutex_destroy(&Tx_mx);
DESTROYLOCK(&Tx_mx);
isc_condition_destroy(&Tx_cv);
isc_mem_destroy(&mctx);
++Tx_nprobs;
@ -288,7 +288,7 @@ t_timers_x(isc_timertype_t timertype, isc_time_t *expires,
isc_timermgr_destroy(&timermgr);
isc_task_destroy(&task);
isc_taskmgr_destroy(&tmgr);
isc_mutex_destroy(&Tx_mx);
DESTROYLOCK(&Tx_mx);
isc_condition_destroy(&Tx_cv);
isc_mem_destroy(&mctx);
++Tx_nprobs;
@ -304,7 +304,7 @@ t_timers_x(isc_timertype_t timertype, isc_time_t *expires,
isc_timermgr_destroy(&timermgr);
isc_task_destroy(&task);
isc_taskmgr_destroy(&tmgr);
isc_mutex_destroy(&Tx_mx);
DESTROYLOCK(&Tx_mx);
isc_condition_destroy(&Tx_cv);
isc_mem_destroy(&mctx);
++Tx_nprobs;
@ -333,7 +333,7 @@ t_timers_x(isc_timertype_t timertype, isc_time_t *expires,
isc_task_detach(&task);
isc_taskmgr_destroy(&tmgr);
isc_timermgr_destroy(&timermgr);
isc_mutex_destroy(&Tx_mx);
DESTROYLOCK(&Tx_mx);
isc_condition_destroy(&Tx_cv);
isc_mem_destroy(&mctx);
@ -890,7 +890,7 @@ t_timers5(void) {
if (isc_result != ISC_R_SUCCESS) {
t_info("isc_condition_init failed %s\n",
isc_result_totext(isc_result));
isc_mutex_destroy(&T5_mx);
DESTROYLOCK(&T5_mx);
isc_mem_destroy(&mctx);
return(T_UNRESOLVED);
}
@ -900,7 +900,7 @@ t_timers5(void) {
if (isc_result != ISC_R_SUCCESS) {
t_info("isc_taskmgr_create failed %s\n",
isc_result_totext(isc_result));
isc_mutex_destroy(&T5_mx);
DESTROYLOCK(&T5_mx);
isc_condition_destroy(&T5_cv);
isc_mem_destroy(&mctx);
return(T_UNRESOLVED);
@ -912,7 +912,7 @@ t_timers5(void) {
t_info("isc_timermgr_create failed %s\n",
isc_result_totext(isc_result));
isc_taskmgr_destroy(&tmgr);
isc_mutex_destroy(&T5_mx);
DESTROYLOCK(&T5_mx);
isc_condition_destroy(&T5_cv);
isc_mem_destroy(&mctx);
return(T_UNRESOLVED);
@ -925,7 +925,7 @@ t_timers5(void) {
isc_result_totext(isc_result));
isc_timermgr_destroy(&timermgr);
isc_taskmgr_destroy(&tmgr);
isc_mutex_destroy(&T5_mx);
DESTROYLOCK(&T5_mx);
isc_condition_destroy(&T5_cv);
isc_mem_destroy(&mctx);
return(T_UNRESOLVED);
@ -938,7 +938,7 @@ t_timers5(void) {
isc_timermgr_destroy(&timermgr);
isc_task_destroy(&T5_task1);
isc_taskmgr_destroy(&tmgr);
isc_mutex_destroy(&T5_mx);
DESTROYLOCK(&T5_mx);
isc_condition_destroy(&T5_cv);
isc_mem_destroy(&mctx);
return(T_UNRESOLVED);
@ -952,7 +952,7 @@ t_timers5(void) {
isc_timermgr_destroy(&timermgr);
isc_task_destroy(&T5_task1);
isc_taskmgr_destroy(&tmgr);
isc_mutex_destroy(&T5_mx);
DESTROYLOCK(&T5_mx);
isc_condition_destroy(&T5_cv);
isc_mem_destroy(&mctx);
return(T_UNRESOLVED);
@ -964,7 +964,7 @@ t_timers5(void) {
isc_result_totext(isc_result));
isc_timermgr_destroy(&timermgr);
isc_taskmgr_destroy(&tmgr);
isc_mutex_destroy(&T5_mx);
DESTROYLOCK(&T5_mx);
isc_condition_destroy(&T5_cv);
isc_mem_destroy(&mctx);
return(T_UNRESOLVED);
@ -989,7 +989,7 @@ t_timers5(void) {
isc_task_destroy(&T5_task1);
isc_task_destroy(&T5_task2);
isc_taskmgr_destroy(&tmgr);
isc_mutex_destroy(&T5_mx);
DESTROYLOCK(&T5_mx);
isc_condition_destroy(&T5_cv);
isc_mem_destroy(&mctx);
return(T_UNRESOLVED);
@ -1006,7 +1006,7 @@ t_timers5(void) {
isc_task_destroy(&T5_task1);
isc_task_destroy(&T5_task2);
isc_taskmgr_destroy(&tmgr);
isc_mutex_destroy(&T5_mx);
DESTROYLOCK(&T5_mx);
isc_condition_destroy(&T5_cv);
isc_mem_destroy(&mctx);
return(T_UNRESOLVED);
@ -1025,7 +1025,7 @@ t_timers5(void) {
isc_task_destroy(&T5_task1);
isc_task_destroy(&T5_task2);
isc_taskmgr_destroy(&tmgr);
isc_mutex_destroy(&T5_mx);
DESTROYLOCK(&T5_mx);
isc_condition_destroy(&T5_cv);
isc_mem_destroy(&mctx);
++T5_nprobs;
@ -1062,7 +1062,7 @@ t_timers5(void) {
isc_task_destroy(&T5_task1);
isc_task_destroy(&T5_task2);
isc_taskmgr_destroy(&tmgr);
isc_mutex_destroy(&T5_mx);
DESTROYLOCK(&T5_mx);
isc_condition_destroy(&T5_cv);
isc_mem_destroy(&mctx);

View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: tkey_test.c,v 1.31 2000/08/17 19:17:55 bwelling Exp $ */
/* $Id: tkey_test.c,v 1.32 2000/08/30 01:35:39 bwelling Exp $ */
/*
* Principal Author: Brian Wellington (core copied from res_test.c)
@ -492,7 +492,7 @@ main(int argc, char *argv[]) {
isc_mem_stats(mctx, stdout);
isc_mem_destroy(&mctx);
isc_mutex_destroy(&lock);
DESTROYLOCK(&lock);
isc_app_finish();