diff options
author | Elliott Hughes <enh@google.com> | 2014-03-10 22:55:52 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-10 22:55:52 +0000 |
commit | d22a6b47204f7866039049fba566fc8c75598ff0 (patch) | |
tree | 5ff5bd809310c8e874dd73ce7f64a2ec788521ed | |
parent | 57f6553aa48cdcce383d3c5aac2c8280b6747da8 (diff) | |
parent | 3f372e3620389d71bfddc14247a585e98cb89adc (diff) | |
download | extras-d22a6b47204f7866039049fba566fc8c75598ff0.tar.gz |
Merge "Remove timer tests."
-rw-r--r-- | tests/bionic/libc/Android.mk | 3 | ||||
-rw-r--r-- | tests/bionic/libc/other/test_timer_create.c | 88 | ||||
-rw-r--r-- | tests/bionic/libc/other/test_timer_create2.c | 100 | ||||
-rw-r--r-- | tests/bionic/libc/other/test_timer_create3.c | 107 |
4 files changed, 0 insertions, 298 deletions
diff --git a/tests/bionic/libc/Android.mk b/tests/bionic/libc/Android.mk index fc3a00ef..9047f8b5 100644 --- a/tests/bionic/libc/Android.mk +++ b/tests/bionic/libc/Android.mk @@ -156,9 +156,6 @@ sources := \ other/test_sysconf.c \ other/test_system.c \ other/test_thread_max.c \ - other/test_timer_create.c \ - other/test_timer_create2.c \ - other/test_timer_create3.c \ other/test_vfprintf_leak.c \ ifeq ($(TARGET_ARCH),arm) diff --git a/tests/bionic/libc/other/test_timer_create.c b/tests/bionic/libc/other/test_timer_create.c deleted file mode 100644 index 8995e121..00000000 --- a/tests/bionic/libc/other/test_timer_create.c +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * 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 COPYRIGHT HOLDERS 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 - * COPYRIGHT OWNER 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 <stdio.h> -#include <time.h> -#include <signal.h> -#include <pthread.h> -#include <string.h> -#include <unistd.h> - -void -handle(sigval_t v) -{ - time_t t; - char p[32]; - - time(&t); - strftime(p, sizeof(p), "%T", localtime(&t)); - printf("%s thread %d, val = %d, signal captured.\n", - p, (int)pthread_self(), v.sival_int); - return; -} - -int -create(int seconds, int id) -{ - timer_t tid; - struct sigevent se; - struct itimerspec ts, ots; - - memset(&se, 0, sizeof (se)); - se.sigev_notify = SIGEV_THREAD; - se.sigev_notify_function = handle; - se.sigev_value.sival_int = id; - - if (timer_create (CLOCK_REALTIME, &se, &tid) < 0) - { - perror ("timer_creat"); - return -1; - } - puts ("timer_create successfully."); - ts.it_value.tv_sec = 3; - ts.it_value.tv_nsec = 0; - ts.it_interval.tv_sec = seconds; - ts.it_interval.tv_nsec = 0; - if (timer_settime (tid, TIMER_ABSTIME, &ts, &ots) < 0) - { - perror ("timer_settime"); - return -1; - } - return 0; -} - -int -main (void) -{ - if (create (3, 1) < 0) return 1; - if (create (5, 2) < 0) return 1; - for (;;) - { - sleep (10); - } - return 0; -} diff --git a/tests/bionic/libc/other/test_timer_create2.c b/tests/bionic/libc/other/test_timer_create2.c deleted file mode 100644 index 10e95e4e..00000000 --- a/tests/bionic/libc/other/test_timer_create2.c +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * 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 COPYRIGHT HOLDERS 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 - * COPYRIGHT OWNER 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 <stdio.h> -#include <time.h> -#include <signal.h> -#include <pthread.h> -#include <string.h> -#include <unistd.h> - -void -handle(int v) -{ - time_t t; - char p[32]; - - time(&t); - strftime(p, sizeof(p), "%T", localtime(&t)); - printf("%s thread %p, val = %d, signal captured.\n", - p, pthread_self(), v); - return; -} - -int -create(int seconds, int id) -{ - timer_t tid; - struct sigevent se; - struct itimerspec ts, ots; - - memset(&se, 0, sizeof (se)); - se.sigev_notify = SIGEV_SIGNAL; - se.sigev_signo = SIGUSR1; - - if (timer_create (CLOCK_REALTIME, &se, &tid) < 0) - { - perror ("timer_creat"); - return -1; - } - printf("timer_create successfully = %d.\n", (int)tid); - ts.it_value.tv_sec = 3; - ts.it_value.tv_nsec = 0; - ts.it_interval.tv_sec = seconds; - ts.it_interval.tv_nsec = 0; - if (timer_settime (tid, TIMER_ABSTIME, &ts, &ots) < 0) - { - perror ("timer_settime"); - return -1; - } - return 0; -} - -int -main (void) -{ - sigset_t mask[1]; - struct sigaction act[1]; - - sigemptyset(mask); - sigaddset(mask, SIGUSR1); - sigprocmask(SIG_UNBLOCK,mask,NULL); - - memset(act, 0, sizeof(*act)); - act->sa_handler = handle; - sigaction( SIGUSR1, act, NULL ); - - printf("main thread is %p\n", pthread_self()); - - if (create (3, 1) < 0) return 1; - if (create (5, 2) < 0) return 1; - for (;;) - { - sleep (10); - } - return 0; -} diff --git a/tests/bionic/libc/other/test_timer_create3.c b/tests/bionic/libc/other/test_timer_create3.c deleted file mode 100644 index 193f37ef..00000000 --- a/tests/bionic/libc/other/test_timer_create3.c +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * 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 COPYRIGHT HOLDERS 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 - * COPYRIGHT OWNER 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 <stdio.h> -#include <time.h> -#include <signal.h> -#include <pthread.h> -#include <string.h> -#include <unistd.h> - -static timer_t tid; -static int count; - -/* this test program is there to check that disarming a timer - * can be done by calling timer_settime() with an it_interval - * value of 0 - */ -void -handle(sigval_t v) -{ - time_t t; - char p[32]; - struct itimerspec ts; - - time(&t); - strftime(p, sizeof(p), "%T", localtime(&t)); - printf("%s thread %d, val = %d, signal captured.\n", - p, (int)pthread_self(), v.sival_int); - count += 1; - - /* this should disable the timer, and hence make 'count' no more than 1 */ - ts.it_value.tv_sec = 0; - ts.it_value.tv_nsec = 0; - ts.it_interval.tv_sec = 1; - ts.it_interval.tv_nsec = 0; - timer_settime(tid, TIMER_ABSTIME, &ts, NULL); - - return; -} - -int -create(int seconds, int id) -{ - struct sigevent se; - struct itimerspec ts, ots; - - memset(&se, 0, sizeof (se)); - se.sigev_notify = SIGEV_THREAD; - se.sigev_notify_function = handle; - se.sigev_value.sival_int = id; - - if (timer_create (CLOCK_REALTIME, &se, &tid) < 0) - { - perror ("timer_creat"); - return -1; - } - puts ("timer_create successfully."); - ts.it_value.tv_sec = 0; - ts.it_value.tv_nsec = 1; - ts.it_interval.tv_sec = seconds; - ts.it_interval.tv_nsec = 0; - if (timer_settime (tid, TIMER_ABSTIME, &ts, &ots) < 0) - { - perror ("timer_settime"); - return -1; - } - return 0; -} - -int -main (void) -{ - if (create (1, 1) < 0) return 1; - sleep (4); - - if (count == 1) { - printf("OK\n"); - return 0; - } else { - printf("KO (count=%d)\n", count); - return 1; - } -} |