diff --git a/lib/roken/Makefile.am b/lib/roken/Makefile.am index 6305763ef..409947c80 100644 --- a/lib/roken/Makefile.am +++ b/lib/roken/Makefile.am @@ -18,6 +18,7 @@ check_PROGRAMS = \ getaddrinfo-test \ parse_bytes-test \ parse_reply-test \ + parse_time-test \ snprintf-test \ strpftime-test @@ -33,6 +34,8 @@ libtest_la_CFLAGS = -DTEST_SNPRINTF parse_reply_test_SOURCES = parse_reply-test.c resolve.c parse_reply_test_CFLAGS = -DTEST_RESOLVE +parse_time_test_SOURCES = parse_time-test.c test-mem.c + strpftime_test_SOURCES = strpftime-test.c strpftime_test_LDADD = libtest.la $(LDADD) snprintf_test_SOURCES = snprintf-test.c @@ -146,6 +149,8 @@ include_HEADERS = \ xdbm.h \ $(XHEADERS) +build_HEADERZ = test-mem.h + nodist_include_HEADERS = roken.h man_MANS = getarg.3 parse_time.3 rtbl.3 diff --git a/lib/roken/parse_time-test.c b/lib/roken/parse_time-test.c new file mode 100644 index 000000000..6770ae6e0 --- /dev/null +++ b/lib/roken/parse_time-test.c @@ -0,0 +1,101 @@ +/* + * Copyright (c) 2004 Kungliga Tekniska Högskolan + * (Royal Institute of Technology, Stockholm, Sweden). + * All rights reserved. + * + * 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. + * + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE 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 INSTITUTE 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. + */ + +#ifdef HAVE_CONFIG_H +#include +RCSID("$Id$"); +#endif + +#include "roken.h" +#include "parse_time.h" +#include "test-mem.h" + +static struct testcase { + size_t size; + time_t val; + char *str; +} tests[] = { + { 8, 1, "1 second" }, + { 17, 61, "1 minute 1 second" }, + { 18, 62, "1 minute 2 seconds" } +}; + +int +main(int argc, char **argv) +{ + size_t sz; + int i, j; + int ret = 0; + + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); ++i) { + char *buf; + + for (j = 1; j < tests[i].size + 2; j++) { + + buf = rk_test_mem_alloc(RK_TM_OVERRUN, "overrun", + NULL, j); + sz = unparse_time(tests[i].val, buf, j); + if (sz != tests[i].size) + errx(1, "sz (%lu) != tests[%d].size (%lu)", + (unsigned long)sz, i, + (unsigned long)tests[i].size); + if (strncmp(buf, tests[i].str, j - 1) != 0) + errx(1, "test %i wrong result %s vs %s", i, buf, tests[i].str); + rk_test_mem_free("overrun"); + + buf = rk_test_mem_alloc(RK_TM_UNDERRUN, "underrun", + NULL, tests[i].size); + sz = unparse_time(tests[i].val, buf, j); + if (sz != tests[i].size) + errx(1, "sz (%lu) != tests[%d].size (%lu)", + (unsigned long)sz, i, (unsigned long)tests[i].size); + if (strncmp(buf, tests[i].str, j - 1) != 0) + errx(1, "test %i wrong result %s vs %s", i, buf, tests[i].str); + rk_test_mem_free("underrun"); + } + buf = rk_test_mem_alloc(RK_TM_OVERRUN, "overrun", + tests[i].str, tests[i].size + 1); + j = parse_time(buf, "s"); + if (j != tests[i].val) + errx(1, "parse_time failed for test %d", i); + rk_test_mem_free("overrun"); + + buf = rk_test_mem_alloc(RK_TM_UNDERRUN, "underrun", + tests[i].str, tests[i].size + 1); + j = parse_time(buf, "s"); + if (j != tests[i].val) + errx(1, "parse_time failed for test %d", i); + rk_test_mem_free("underrun"); + } + return 0; +} diff --git a/lib/roken/test-mem.c b/lib/roken/test-mem.c new file mode 100644 index 000000000..9980925dd --- /dev/null +++ b/lib/roken/test-mem.c @@ -0,0 +1,195 @@ +/* + * Copyright (c) 1999 - 2004 Kungliga Tekniska Högskolan + * (Royal Institute of Technology, Stockholm, Sweden). + * All rights reserved. + * + * 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. + * + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE 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 INSTITUTE 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. + */ + +#ifdef HAVE_CONFIG_H +#include +#endif +#ifdef HAVE_SYS_MMAN_H +#include +#endif +#include +#include +#include +#include + +#include "test-mem.h" + +RCSID("$Id$"); + +/* #undef HAVE_MMAP */ + +struct { + void *start; + size_t size; + void *data_start; + size_t data_size; + enum rk_test_mem_type type; +} map; + +struct sigaction sa, osa; + +char *testname; + +static RETSIGTYPE +segv_handler(int sig) +{ + int fd; + char msg[] = "SIGSEGV i current test: "; + + fd = open("/dev/stdout", O_WRONLY, 0600); + if (fd >= 0) { + write(fd, msg, sizeof(msg) - 1); + write(fd, testname, strlen(testname)); + write(fd, "\n", 1); + close(fd); + } + _exit(1); +} + +#define TESTREC() \ + if (testname) \ + errx(1, "test %s run recursively on %s", name, testname); \ + testname = strdup(name); \ + if (testname == NULL) \ + errx(1, "malloc"); + + +void * +rk_test_mem_alloc(enum rk_test_mem_type type, const char *name, + void *buf, size_t size) +{ +#ifndef HAVE_MMAP + unsigned char *p; + + TESTREC(); + + p = malloc(size + 2); + if (p == NULL) + errx(1, "malloc"); + map.type = type; + map.start = p; + map.size = size + 2; + p[0] = 0xff; + p[map.size] = 0xff; + map.data_start = p + 1; +#else + unsigned char *p; + int flags, ret, fd; + size_t pagesize = getpagesize(); + + TESTREC(); + + map.type = type; + +#ifdef MAP_ANON + flags = MAP_ANON; + fd = -1; +#else + flags = 0; + fd = open ("/dev/zero", O_RDONLY); + if(fd < 0) + err (1, "open /dev/zero"); +#endif + flags |= MAP_PRIVATE; + + map.size = size + pagesize - (size % pagesize) + pagesize * 2; + + p = (char *)mmap(0, map.size, PROT_READ | PROT_WRITE, + flags, fd, 0); + if (p == (unsigned char *)MAP_FAILED) + err (1, "mmap"); + + map.start = p; + + ret = mprotect (p, pagesize, 0); + if (ret < 0) + err (1, "mprotect"); + + ret = mprotect (p + map.size - pagesize, pagesize, 0); + if (ret < 0) + err (1, "mprotect"); + + switch (type) { + case RK_TM_OVERRUN: + map.data_start = p + map.size - pagesize - size; + break; + case RK_TM_UNDERRUN: + map.data_start = p + pagesize; + break; + default: + abort(); + } +#endif + sigemptyset (&sa.sa_mask); + sa.sa_flags = 0; +#ifdef SA_RESETHAND + sa.sa_flags |= SA_RESETHAND; +#endif + sa.sa_handler = segv_handler; + sigaction (SIGSEGV, &sa, &osa); + + map.data_size = size; + if (buf) + memcpy(map.data_start, buf, size); + return map.data_start; +} + +void +rk_test_mem_free(const char *map_name) +{ +#ifndef HAVE_MMAP + unsigned char *p = map.start; + + if (testname == NULL) + errx(1, "test_mem_free call on no free"); + + if (p[0] != 0xff) + errx(1, "%s: %s underrun %x\n", testname, map_name, p[0]); + if (p[map.size] != 0xff) + errx(1, "%s: %s overrun %x\n", testname, map_name, p[map.size - 1]); + free(map.start); +#else + int ret; + + if (testname == NULL) + errx(1, "test_mem_free call on no free"); + + ret = munmap (map.start, map.size); + if (ret < 0) + err (1, "munmap"); +#endif + free(testname); + testname = NULL; + + sigaction (SIGSEGV, &osa, NULL); +} diff --git a/lib/roken/test-mem.h b/lib/roken/test-mem.h new file mode 100644 index 000000000..589326afc --- /dev/null +++ b/lib/roken/test-mem.h @@ -0,0 +1,37 @@ +/* + * Copyright (c) 1999 - 2004 Kungliga Tekniska Högskolan + * (Royal Institute of Technology, Stockholm, Sweden). + * All rights reserved. + * + * 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. + * + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE 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 INSTITUTE 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. + */ + +enum rk_test_mem_type { RK_TM_OVERRUN, RK_TM_UNDERRUN }; + +void * rk_test_mem_alloc(enum rk_test_mem_type, const char *, void *, size_t); +void rk_test_mem_free(const char *);