Module Name: src Committed By: tron Date: Sun Nov 14 19:19:25 UTC 2010
Modified Files: src/tests/lib/libc/stdlib: Makefile t_environment.c Log Message: Add a new regression test "t_threaded" which tests using getenv_r(3), putenv(3), setenv(3) and unsetenv(3) concurrently. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/stdlib/Makefile cvs rdiff -u -r1.10 -r1.11 src/tests/lib/libc/stdlib/t_environment.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/tests/lib/libc/stdlib/Makefile diff -u src/tests/lib/libc/stdlib/Makefile:1.2 src/tests/lib/libc/stdlib/Makefile:1.3 --- src/tests/lib/libc/stdlib/Makefile:1.2 Thu Sep 23 17:38:08 2010 +++ src/tests/lib/libc/stdlib/Makefile Sun Nov 14 19:19:24 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2010/09/23 17:38:08 christos Exp $ +# $NetBSD: Makefile,v 1.3 2010/11/14 19:19:24 tron Exp $ .include <bsd.own.mk> @@ -6,4 +6,6 @@ TESTS_C+= t_mi_vector_hash t_environment +LDADD.t_environment= -pthread + .include <bsd.test.mk> Index: src/tests/lib/libc/stdlib/t_environment.c diff -u src/tests/lib/libc/stdlib/t_environment.c:1.10 src/tests/lib/libc/stdlib/t_environment.c:1.11 --- src/tests/lib/libc/stdlib/t_environment.c:1.10 Sun Nov 14 18:15:08 2010 +++ src/tests/lib/libc/stdlib/t_environment.c Sun Nov 14 19:19:24 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: t_environment.c,v 1.10 2010/11/14 18:15:08 tron Exp $ */ +/* $NetBSD: t_environment.c,v 1.11 2010/11/14 19:19:24 tron Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. * All rights reserved. @@ -32,19 +32,22 @@ */ #include <sys/cdefs.h> -__RCSID("$NetBSD: t_environment.c,v 1.10 2010/11/14 18:15:08 tron Exp $"); +__RCSID("$NetBSD: t_environment.c,v 1.11 2010/11/14 19:19:24 tron Exp $"); #include <atf-c.h> #include <errno.h> +#include <pthread.h> #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <time.h> 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) { @@ -77,6 +80,12 @@ "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; @@ -185,6 +194,120 @@ 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); @@ -192,6 +315,7 @@ 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(); }