From 95799c090cc4aae52c57feaba43fbf2d62586a76 Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Fri, 13 Apr 2001 02:19:37 +0000 Subject: [PATCH] a cleaner approach to the whole issue of shutting up warnings for threaded vs non-threaded builds. both compile without any warnings now. --- bin/tests/tasks/t_tasks.c | 120 +++++++++----------- bin/tests/timers/t_timers.c | 213 ++++++++++++++++++------------------ 2 files changed, 160 insertions(+), 173 deletions(-) diff --git a/bin/tests/tasks/t_tasks.c b/bin/tests/tasks/t_tasks.c index cf0d86b46e..52bee589cd 100644 --- a/bin/tests/tasks/t_tasks.c +++ b/bin/tests/tasks/t_tasks.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: t_tasks.c,v 1.25 2001/04/12 22:56:00 tale Exp $ */ +/* $Id: t_tasks.c,v 1.26 2001/04/13 02:19:35 tale Exp $ */ #include @@ -32,6 +32,19 @@ #include +#ifdef ISC_PLATFORM_USETHREADS +isc_boolean_t threaded = ISC_TRUE; +#else +isc_boolean_t threaded = ISC_FALSE; +#endif + +static void +require_threads(void) { + t_info("This test requires threads\n"); + t_result(T_UNTESTED); + return; +} + static void t1_callback(isc_task_t *task, isc_event_t *event) { int i; @@ -460,10 +473,6 @@ t2_callback(isc_task_t *task, isc_event_t *event) { static int t_tasks2(void) { -#if ! ISC_PLATFORM_USETHREADS - t_info("This test requires threads\n"); - return (T_UNTESTED); -#else int ntasks; int result; char *p; @@ -553,18 +562,18 @@ t_tasks2(void) { result = T_FAIL; return(result); -#endif /* ISC_PLATFORM_USETHREADS */ } static const char *a2 = "The task subsystem can create ISC_TASKS_MIN tasks"; static void t2(void) { - int result; - t_assert("tasks", 2, T_REQUIRED, a2); - result = t_tasks2(); - t_result(result); + + if (threaded) + t_result(t_tasks2()); + else + require_threads(); } #define T3_NEVENTS 256 @@ -647,10 +656,6 @@ t3_event2(isc_task_t *task, isc_event_t *event) { static int t_tasks3(void) { -#if ! ISC_PLATFORM_USETHREADS - t_info("This test requires threads\n"); - return (T_UNTESTED); -#else int cnt; int result; char *p; @@ -814,7 +819,6 @@ t_tasks3(void) { result = T_PASS; return(result); -#endif /* ISC_PLATFORM_USETHREADS */ } static const char *a3 = "When isc_task_shutdown() is called, any shutdown " @@ -823,11 +827,12 @@ static const char *a3 = "When isc_task_shutdown() is called, any shutdown " "LIFO order."; static void t3(void) { - int result; - t_assert("tasks", 3, T_REQUIRED, a3); - result = t_tasks3(); - t_result(result); + + if (threaded) + t_result(t_tasks3()); + else + require_threads(); } static isc_mutex_t T4_mx; @@ -874,10 +879,6 @@ t4_sde(isc_task_t *task, isc_event_t *event) { static int t_tasks4(void) { -#if ! ISC_PLATFORM_USETHREADS - t_info("This test requires threads\n"); - return (T_UNTESTED); -#else int result; char *p; isc_mem_t *mctx; @@ -1010,7 +1011,6 @@ t_tasks4(void) { result = T_PASS; return(result); -#endif /* ISC_PLATFORM_USETHREADS */ } static const char *a4 = @@ -1019,20 +1019,22 @@ static const char *a4 = static void t4(void) { - int result; - t_assert("tasks", 4, T_REQUIRED, a4); - result = t_tasks4(); - t_result(result); + + if (threaded) + t_result(t_tasks4()); + else + require_threads(); } static int T7_nprobs; -static int T7_nfails; static int T7_eflag; static int T7_sdflag; static isc_mutex_t T7_mx; static isc_condition_t T7_cv; +static int T7_nfails; + static void t7_event1(isc_task_t *task, isc_event_t *event) { UNUSED(task); @@ -1076,10 +1078,6 @@ t7_sde(isc_task_t *task, isc_event_t *event) { static int t_tasks7(void) { -#if ! ISC_PLATFORM_USETHREADS - t_info("This test requires threads\n"); - return (T_UNTESTED); -#else int result; char *p; isc_mem_t *mctx; @@ -1237,7 +1235,6 @@ t_tasks7(void) { result = T_PASS; return(result); -#endif /* ISC_PLATFORM_USETHREADS */ } static const char *a7 = "A call to isc_task_create() creates a task that can " @@ -1245,11 +1242,12 @@ static const char *a7 = "A call to isc_task_create() creates a task that can " static void t7(void) { - int result; - t_assert("tasks", 7, T_REQUIRED, a7); - result = t_tasks7(); - t_result(result); + + if (threaded) + t_result(t_tasks7()); + else + require_threads(); } #define T10_SENDERCNT 3 @@ -1656,10 +1654,6 @@ t_taskpurge_x(int sender, int type, int tag, int purge_sender, static int t_tasks10(void) { -#if ! ISC_PLATFORM_USETHREADS - t_info("This test requires threads\n"); - return (T_UNTESTED); -#else int result; T10_nprobs = 0; @@ -1706,7 +1700,6 @@ t_tasks10(void) { result = T_FAIL; return(result); -#endif /* ISC_PLATFORM_USETHREADS */ } static const char *a10 = @@ -1717,11 +1710,12 @@ static const char *a10 = static void t10(void) { - int result; - t_assert("tasks", 10, T_REQUIRED, a10); - result = t_tasks10(); - t_result(result); + + if (threaded) + t_result(t_tasks10()); + else + require_threads(); } static int T11_nprobs; @@ -1807,10 +1801,6 @@ t11_sde(isc_task_t *task, isc_event_t *event) { static int t_tasks11(int purgable) { -#if ! ISC_PLATFORM_USETHREADS - t_info("This test requires threads\n"); - return (T_UNTESTED); -#else char *p; isc_mem_t *mctx; isc_taskmgr_t *tmgr; @@ -1988,7 +1978,6 @@ t_tasks11(int purgable) { result = T_FAIL; return(result); -#endif /* ISC_PLATFORM_USETHREADS */ } static const char *a11 = @@ -1998,10 +1987,12 @@ static const char *a11 = static void t11(void) { - int result; t_assert("tasks", 11, T_REQUIRED, a11); - result = t_tasks11(1); - t_result(result); + + if (threaded) + t_result(t_tasks11(1)); + else + require_threads(); } static const char *a12 = @@ -2018,6 +2009,7 @@ t_tasks12(void) { static void t12(void) { int result; + t_assert("tasks", 12, T_REQUIRED, a12); result = t_tasks12(); t_result(result); @@ -2036,10 +2028,6 @@ static const char *a13 = static int t_tasks13(void) { -#if ! ISC_PLATFORM_USETHREADS - t_info("This test requires threads\n"); - return (T_UNTESTED); -#else int result; T13_nfails = 0; @@ -2124,16 +2112,16 @@ t_tasks13(void) { result = T_FAIL; return (result); -#endif /* ISC_PLATFORM_USETHREADS */ } static void t13(void) { - int result; - t_assert("tasks", 13, T_REQUIRED, a13); - result = t_tasks13(); - t_result(result); + + if (threaded) + t_result(t_tasks13()); + else + require_threads(); } #define T14_NTASKS 10 @@ -2232,8 +2220,8 @@ t_tasks14(void) { return(T_FAIL); } - event = isc_event_allocate(mctx, NULL, 1, t14_callback, (void *) i, - sizeof *event); + event = isc_event_allocate(mctx, NULL, 1, t14_callback, + (void *)i, sizeof *event); if (event == NULL) { t_info("isc_event_allocate failed\n"); return(T_UNRESOLVED); diff --git a/bin/tests/timers/t_timers.c b/bin/tests/timers/t_timers.c index 91011e41e4..aef6ff4e06 100644 --- a/bin/tests/timers/t_timers.c +++ b/bin/tests/timers/t_timers.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: t_timers.c,v 1.20 2001/04/12 22:56:02 tale Exp $ */ +/* $Id: t_timers.c,v 1.21 2001/04/13 02:19:37 tale Exp $ */ #include @@ -31,6 +31,12 @@ #include +#ifdef ISC_PLATFORM_USETHREADS +isc_boolean_t threaded = ISC_TRUE; +#else +isc_boolean_t threaded = ISC_FALSE; +#endif + #define Tx_FUDGE_SECONDS 0 /* in absence of clock_getres() */ #define Tx_FUDGE_NANOSECONDS 500000000 /* in absence of clock_getres() */ @@ -46,6 +52,13 @@ static isc_timer_t *Tx_timer; static int Tx_seconds; static int Tx_nanoseconds; +static void +require_threads(void) { + t_info("This test requires threads\n"); + t_result(T_UNTESTED); + return; +} + static void tx_sde(isc_task_t *task, isc_event_t *event) { isc_result_t isc_result; @@ -350,36 +363,33 @@ static const char *a1 = static void t1(void) { -#if ! ISC_PLATFORM_USETHREADS - t_info("This test requires threads\n"); - t_result(T_UNTESTED); - return; -#else int result; isc_time_t expires; isc_interval_t interval; t_assert("isc_timer_create", 1, T_REQUIRED, a1); - Tx_nfails = 0; - Tx_nprobs = 0; - Tx_nevents = 12; - Tx_seconds = T1_SECONDS; - Tx_nanoseconds = T1_NANOSECONDS; - isc_interval_set(&interval, Tx_seconds, Tx_nanoseconds); - isc_time_settoepoch(&expires); + if (threaded) { + Tx_nfails = 0; + Tx_nprobs = 0; + Tx_nevents = 12; + Tx_seconds = T1_SECONDS; + Tx_nanoseconds = T1_NANOSECONDS; + isc_interval_set(&interval, Tx_seconds, Tx_nanoseconds); + isc_time_settoepoch(&expires); - t_timers_x(isc_timertype_ticker, &expires, &interval, tx_te); + t_timers_x(isc_timertype_ticker, &expires, &interval, tx_te); - result = T_UNRESOLVED; + result = T_UNRESOLVED; - if ((Tx_nfails == 0) && (Tx_nprobs == 0)) - result = T_PASS; - else if (Tx_nfails) - result = T_FAIL; + if ((Tx_nfails == 0) && (Tx_nprobs == 0)) + result = T_PASS; + else if (Tx_nfails) + result = T_FAIL; - t_result(result); -#endif /* ISC_PLATFORM_USETHREADS */ + t_result(result); + } else + require_threads(); } #define T2_SECONDS 5 @@ -393,11 +403,6 @@ static const char *a2 = static void t2(void) { -#if ! ISC_PLATFORM_USETHREADS - t_info("This test requires threads\n"); - t_result(T_UNTESTED); - return; -#else int result; int isc_result; isc_time_t expires; @@ -405,33 +410,36 @@ t2(void) { t_assert("isc_timer_create", 2, T_REQUIRED, a2); - Tx_nfails = 0; - Tx_nprobs = 0; - Tx_nevents = 1; - Tx_seconds = T2_SECONDS; - Tx_nanoseconds = T2_NANOSECONDS; - isc_interval_set(&interval, Tx_seconds, Tx_nanoseconds); + if (threaded) { + Tx_nfails = 0; + Tx_nprobs = 0; + Tx_nevents = 1; + Tx_seconds = T2_SECONDS; + Tx_nanoseconds = T2_NANOSECONDS; + isc_interval_set(&interval, Tx_seconds, Tx_nanoseconds); - isc_result = isc_time_nowplusinterval(&expires, &interval); - if (isc_result == ISC_R_SUCCESS) { + isc_result = isc_time_nowplusinterval(&expires, &interval); + if (isc_result == ISC_R_SUCCESS) { - isc_interval_set(&interval, 0, 0); - t_timers_x(isc_timertype_once, &expires, &interval, tx_te); + isc_interval_set(&interval, 0, 0); + t_timers_x(isc_timertype_once, &expires, &interval, + tx_te); - } else { - t_info("isc_time_nowplusinterval failed %s\n", - isc_result_totext(isc_result)); - } + } else { + t_info("isc_time_nowplusinterval failed %s\n", + isc_result_totext(isc_result)); + } - result = T_UNRESOLVED; + result = T_UNRESOLVED; - if ((Tx_nfails == 0) && (Tx_nprobs == 0)) - result = T_PASS; - else if (Tx_nfails) - result = T_FAIL; + if ((Tx_nfails == 0) && (Tx_nprobs == 0)) + result = T_PASS; + else if (Tx_nfails) + result = T_FAIL; - t_result(result); -#endif /* ISC_PLATFORM_USETHREADS */ + t_result(result); + } else + require_threads(); } static void @@ -521,11 +529,6 @@ static const char *a3 = static void t3(void) { -#if ! ISC_PLATFORM_USETHREADS - t_info("This test requires threads\n"); - t_result(T_UNTESTED); - return; -#else int result; int isc_result; isc_time_t expires; @@ -533,34 +536,37 @@ t3(void) { t_assert("isc_timer_create", 3, T_REQUIRED, a3); - Tx_nfails = 0; - Tx_nprobs = 0; - Tx_nevents = 1; - Tx_seconds = T3_SECONDS; - Tx_nanoseconds = T3_NANOSECONDS; + if (threaded) { + Tx_nfails = 0; + Tx_nprobs = 0; + Tx_nevents = 1; + Tx_seconds = T3_SECONDS; + Tx_nanoseconds = T3_NANOSECONDS; - isc_interval_set(&interval, Tx_seconds + 1, Tx_nanoseconds); + isc_interval_set(&interval, Tx_seconds + 1, Tx_nanoseconds); - isc_result = isc_time_nowplusinterval(&expires, &interval); - if (isc_result == ISC_R_SUCCESS) { - isc_interval_set(&interval, Tx_seconds, Tx_nanoseconds); - t_timers_x(isc_timertype_once, &expires, &interval, t3_te); - } - else { - t_info("isc_time_nowplusinterval failed %s\n", - isc_result_totext(isc_result)); - ++Tx_nprobs; - } + isc_result = isc_time_nowplusinterval(&expires, &interval); + if (isc_result == ISC_R_SUCCESS) { + isc_interval_set(&interval, Tx_seconds, + Tx_nanoseconds); + t_timers_x(isc_timertype_once, &expires, &interval, + t3_te); + } else { + t_info("isc_time_nowplusinterval failed %s\n", + isc_result_totext(isc_result)); + ++Tx_nprobs; + } - result = T_UNRESOLVED; + result = T_UNRESOLVED; - if ((Tx_nfails == 0) && (Tx_nprobs == 0)) - result = T_PASS; - else if (Tx_nfails) - result = T_FAIL; + if ((Tx_nfails == 0) && (Tx_nprobs == 0)) + result = T_PASS; + else if (Tx_nfails) + result = T_FAIL; - t_result(result); -#endif /* ISC_PLATFORM_USETHREADS */ + t_result(result); + } else + require_threads(); } #define T4_SECONDS 2 @@ -687,35 +693,33 @@ static const char *a4 = static void t4(void) { -#if ! ISC_PLATFORM_USETHREADS - t_info("This test requires threads\n"); - t_result(T_UNTESTED); - return; -#else int result; isc_time_t expires; isc_interval_t interval; - Tx_nfails = 0; - Tx_nprobs = 0; - Tx_nevents = 3; - Tx_seconds = T4_SECONDS; - Tx_nanoseconds = T4_NANOSECONDS; - t_assert("isc_timer_reset", 4, T_REQUIRED, a4); - isc_interval_set(&interval, T4_SECONDS, T4_NANOSECONDS); - isc_time_settoepoch(&expires); - t_timers_x(isc_timertype_ticker, &expires, &interval, t4_te); - result = T_UNRESOLVED; + if (threaded) { + Tx_nfails = 0; + Tx_nprobs = 0; + Tx_nevents = 3; + Tx_seconds = T4_SECONDS; + Tx_nanoseconds = T4_NANOSECONDS; - if ((Tx_nfails == 0) && (Tx_nprobs == 0)) - result = T_PASS; - else if (Tx_nfails) - result = T_FAIL; + isc_interval_set(&interval, T4_SECONDS, T4_NANOSECONDS); + isc_time_settoepoch(&expires); + t_timers_x(isc_timertype_ticker, &expires, &interval, t4_te); - t_result(result); -#endif /* ISC_PLATFORM_USETHREADS */ + result = T_UNRESOLVED; + + if ((Tx_nfails == 0) && (Tx_nprobs == 0)) + result = T_PASS; + else if (Tx_nfails) + result = T_FAIL; + + t_result(result); + } else + require_threads(); } #define T5_NTICKS 4 @@ -874,10 +878,6 @@ t5_shutdown_event(isc_task_t *task, isc_event_t *event) { static int t_timers5(void) { -#if ! ISC_PLATFORM_USETHREADS - t_info("This test requires threads\n"); - return (T_UNTESTED); -#else char *p; int result; isc_mem_t *mctx; @@ -1101,8 +1101,7 @@ t_timers5(void) { else if (T5_nfails) result = T_FAIL; - return(result); -#endif /* ISC_PLATFORM_USETHREADS */ + return (result); } static const char *a5 = @@ -1111,11 +1110,12 @@ static const char *a5 = static void t5(void) { - int result; - t_assert("isc_timer_reset", 5, T_REQUIRED, a5); - result = t_timers5(); - t_result(result); + + if (threaded) + t_result(t_timers5()); + else + require_threads(); } testspec_t T_testlist[] = { @@ -1126,4 +1126,3 @@ testspec_t T_testlist[] = { { t5, "timer_reset" }, { NULL, NULL } }; -