From 55e8419d17451fcc874fa179e546ead9392fc154 Mon Sep 17 00:00:00 2001 From: tron Date: Tue, 16 Nov 2010 14:03:47 +0000 Subject: [PATCH] Split threaded environment test for the other environment tests as suggested by Nicolas Joly in private e-mail. Linking a binary with "libpthread" effects the beaviour of "libc" and we really want to test both cases. --- tests/lib/libc/stdlib/Makefile | 6 +- tests/lib/libc/stdlib/t_environment.c | 128 +--------------- tests/lib/libc/stdlib/t_environment_pth.c | 177 ++++++++++++++++++++++ 3 files changed, 182 insertions(+), 129 deletions(-) create mode 100644 tests/lib/libc/stdlib/t_environment_pth.c diff --git a/tests/lib/libc/stdlib/Makefile b/tests/lib/libc/stdlib/Makefile index 41ca53662a6c..4d7ed2f9707a 100644 --- a/tests/lib/libc/stdlib/Makefile +++ b/tests/lib/libc/stdlib/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.3 2010/11/14 19:19:24 tron Exp $ +# $NetBSD: Makefile,v 1.4 2010/11/16 14:03:47 tron Exp $ .include TESTSDIR= ${TESTSBASE}/lib/libc/stdlib -TESTS_C+= t_mi_vector_hash t_environment +TESTS_C+= t_mi_vector_hash t_environment t_environment_pth -LDADD.t_environment= -pthread +LDADD.t_environment_pth= -pthread .include diff --git a/tests/lib/libc/stdlib/t_environment.c b/tests/lib/libc/stdlib/t_environment.c index 25365a9adb8d..acbe9862421d 100644 --- a/tests/lib/libc/stdlib/t_environment.c +++ b/tests/lib/libc/stdlib/t_environment.c @@ -1,4 +1,4 @@ -/* $NetBSD: t_environment.c,v 1.11 2010/11/14 19:19:24 tron Exp $ */ +/* $NetBSD: t_environment.c,v 1.12 2010/11/16 14:03:47 tron Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. * All rights reserved. @@ -32,22 +32,19 @@ */ #include -__RCSID("$NetBSD: t_environment.c,v 1.11 2010/11/14 19:19:24 tron Exp $"); +__RCSID("$NetBSD: t_environment.c,v 1.12 2010/11/16 14:03:47 tron Exp $"); #include #include -#include #include #include #include -#include ATF_TC(t_setenv); ATF_TC(t_putenv); ATF_TC(t_clearenv); ATF_TC(t_mixed); ATF_TC(t_getenv); -ATF_TC(t_threaded); ATF_TC_HEAD(t_setenv, tc) { @@ -80,12 +77,6 @@ ATF_TC_HEAD(t_getenv, tc) "Test setenv(3), getenv(3)"); } -ATF_TC_HEAD(t_threaded, tc) -{ - atf_tc_set_md_var(tc, "descr", - "Test concurrent environment access by multiple threads"); -} - ATF_TC_BODY(t_setenv, tc) { const size_t numvars = 8192; @@ -194,120 +185,6 @@ ATF_TC_BODY(t_getenv, tc) ATF_CHECK(unsetenv("EVIL") != -1); } -#define THREADED_NUM_THREADS 4 -#define THREADED_NUM_VARS 16 -#define THREADED_VAR_NAME "THREADED%zu" -#define THREADED_RUN_TIME 5 - -static void * -thread_getenv_r(void *arg) -{ - time_t endtime; - - endtime = *(time_t *)arg; - do { - size_t i; - char name[32], value[128]; - - i = lrand48() % THREADED_NUM_VARS; - (void)snprintf(name, sizeof(name), THREADED_VAR_NAME, i); - - if (getenv_r(name, value, sizeof(value)) == -1) { - ATF_CHECK(errno == ENOENT); - } - } while (time(NULL) < endtime); - - return NULL; -} - -static void * -thread_putenv(void *arg) -{ - time_t endtime; - size_t i; - static char vars[THREADED_NUM_VARS][128]; - - for (i = 0; i < THREADED_NUM_VARS; i++) { - (void)snprintf(vars[i], sizeof(vars[i]), - THREADED_VAR_NAME "=putenv %ld", i, lrand48()); - } - - endtime = *(time_t *)arg; - do { - char name[128]; - - i = lrand48() % THREADED_NUM_VARS; - (void)strlcpy(name, vars[i], sizeof(name)); - *strchr(name, '=') = '\0'; - - ATF_CHECK(unsetenv(name) != -1); - ATF_CHECK(putenv(vars[i]) != -1); - } while (time(NULL) < endtime); - - return NULL; -} - -static void * -thread_setenv(void *arg) -{ - time_t endtime; - - endtime = *(time_t *)arg; - do { - size_t i; - char name[32], value[64]; - - i = lrand48() % THREADED_NUM_VARS; - (void)snprintf(name, sizeof(name), THREADED_VAR_NAME, i); - (void)snprintf(value, sizeof(value), "setenv %ld", lrand48()); - - ATF_CHECK(setenv(name, value, 1) != -1); - } while (time(NULL) < endtime); - - return NULL; -} - -static void * -thread_unsetenv(void *arg) -{ - time_t endtime; - - endtime = *(time_t *)arg; - do { - size_t i; - char name[32]; - - i = lrand48() % THREADED_NUM_VARS; - (void)snprintf(name, sizeof(name), THREADED_VAR_NAME, i); - - ATF_CHECK(unsetenv(name) != -1); - } while (time(NULL) < endtime); - - return NULL; -} - -ATF_TC_BODY(t_threaded, tc) -{ - time_t endtime; - size_t i; - pthread_t threads[THREADED_NUM_THREADS]; - - endtime = time(NULL) + THREADED_RUN_TIME; - - i = 0; - ATF_CHECK(pthread_create(&threads[i++], NULL, thread_getenv_r, - &endtime) == 0); - ATF_CHECK(pthread_create(&threads[i++], NULL, thread_putenv, - &endtime) == 0); - ATF_CHECK(pthread_create(&threads[i++], NULL, thread_setenv, - &endtime) == 0); - ATF_CHECK(pthread_create(&threads[i++], NULL, thread_unsetenv, - &endtime) == 0); - - while(i-- > 0) - ATF_CHECK(pthread_join(threads[i], NULL) == 0); -} - ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, t_setenv); @@ -315,7 +192,6 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, t_clearenv); ATF_TP_ADD_TC(tp, t_mixed); ATF_TP_ADD_TC(tp, t_getenv); - ATF_TP_ADD_TC(tp, t_threaded); return atf_no_error(); } diff --git a/tests/lib/libc/stdlib/t_environment_pth.c b/tests/lib/libc/stdlib/t_environment_pth.c new file mode 100644 index 000000000000..e6c8ed0abc26 --- /dev/null +++ b/tests/lib/libc/stdlib/t_environment_pth.c @@ -0,0 +1,177 @@ +/* $NetBSD: t_environment_pth.c,v 1.1 2010/11/16 14:03:47 tron Exp $ */ + +/*- + * Copyright (c) 2010 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include +__RCSID("$NetBSD: t_environment_pth.c,v 1.1 2010/11/16 14:03:47 tron Exp $"); + +#include +#include +#include +#include +#include +#include +#include + +ATF_TC(t_threaded); + +#define THREADED_NUM_THREADS 8 +#define THREADED_NUM_VARS 16 +#define THREADED_VAR_NAME "THREADED%zu" +#define THREADED_RUN_TIME 10 + +ATF_TC_HEAD(t_threaded, tc) +{ + char timeout[32]; + + atf_tc_set_md_var(tc, "descr", + "Test concurrent access to the environment by multiple threads"); + + (void)snprintf(timeout, sizeof(timeout), "%d", THREADED_RUN_TIME + 5); + atf_tc_set_md_var(tc, "timeout", timeout); +} + +static void * +thread_getenv_r(void *arg) +{ + time_t endtime; + + endtime = *(time_t *)arg; + do { + size_t i; + char name[32], value[128]; + + i = lrand48() % THREADED_NUM_VARS; + (void)snprintf(name, sizeof(name), THREADED_VAR_NAME, i); + + if (getenv_r(name, value, sizeof(value)) == -1) { + ATF_CHECK(errno == ENOENT); + } + } while (time(NULL) < endtime); + + return NULL; +} + +static void * +thread_putenv(void *arg) +{ + time_t endtime; + size_t i; + static char vars[THREADED_NUM_VARS][128]; + + for (i = 0; i < THREADED_NUM_VARS; i++) { + (void)snprintf(vars[i], sizeof(vars[i]), + THREADED_VAR_NAME "=putenv %ld", i, lrand48()); + } + + endtime = *(time_t *)arg; + do { + char name[128]; + + i = lrand48() % THREADED_NUM_VARS; + (void)strlcpy(name, vars[i], sizeof(name)); + *strchr(name, '=') = '\0'; + + ATF_CHECK(unsetenv(name) != -1); + ATF_CHECK(putenv(vars[i]) != -1); + } while (time(NULL) < endtime); + + return NULL; +} + +static void * +thread_setenv(void *arg) +{ + time_t endtime; + + endtime = *(time_t *)arg; + do { + size_t i; + char name[32], value[64]; + + i = lrand48() % THREADED_NUM_VARS; + (void)snprintf(name, sizeof(name), THREADED_VAR_NAME, i); + (void)snprintf(value, sizeof(value), "setenv %ld", lrand48()); + + ATF_CHECK(setenv(name, value, 1) != -1); + } while (time(NULL) < endtime); + + return NULL; +} + +static void * +thread_unsetenv(void *arg) +{ + time_t endtime; + + endtime = *(time_t *)arg; + do { + size_t i; + char name[32]; + + i = lrand48() % THREADED_NUM_VARS; + (void)snprintf(name, sizeof(name), THREADED_VAR_NAME, i); + + ATF_CHECK(unsetenv(name) != -1); + } while (time(NULL) < endtime); + + return NULL; +} + +ATF_TC_BODY(t_threaded, tc) +{ + time_t endtime; + size_t i, j; + pthread_t threads[THREADED_NUM_THREADS]; + + endtime = time(NULL) + THREADED_RUN_TIME; + + i = 0; + for (j = 0; j < 2; j++) { + ATF_CHECK(pthread_create(&threads[i++], NULL, thread_getenv_r, + &endtime) == 0); + ATF_CHECK(pthread_create(&threads[i++], NULL, thread_putenv, + &endtime) == 0); + ATF_CHECK(pthread_create(&threads[i++], NULL, thread_setenv, + &endtime) == 0); + ATF_CHECK(pthread_create(&threads[i++], NULL, thread_unsetenv, + &endtime) == 0); + } + + for (j = 0; j < i; j++) + ATF_CHECK(pthread_join(threads[j], NULL) == 0); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, t_threaded); + + return atf_no_error(); +}