From e310373084912716aed9cbfbe95809d7b9383061 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 18 Sep 2014 16:34:05 -0700 Subject: Remove obsolete semaphore tests. Change-Id: I96d0dbbb8d3482a19ce33e389971451fa630c84a --- tests/bionic/libc/Android.mk | 2 - tests/bionic/libc/common/test_sem_post.c | 98 ----------------------- tests/bionic/libc/common/test_semaphore.c | 129 ------------------------------ 3 files changed, 229 deletions(-) delete mode 100644 tests/bionic/libc/common/test_sem_post.c delete mode 100644 tests/bionic/libc/common/test_semaphore.c diff --git a/tests/bionic/libc/Android.mk b/tests/bionic/libc/Android.mk index 3fc3c399..aff44039 100644 --- a/tests/bionic/libc/Android.mk +++ b/tests/bionic/libc/Android.mk @@ -70,8 +70,6 @@ sources := \ common/test_pthread_mutex.c \ common/test_pthread_rwlock.c \ common/test_pthread_once.c \ - common/test_semaphore.c \ - common/test_sem_post.c \ common/test_seteuid.c \ common/test_static_cpp_mutex.cpp \ common/test_udp.c \ diff --git a/tests/bionic/libc/common/test_sem_post.c b/tests/bionic/libc/common/test_sem_post.c deleted file mode 100644 index adc0f859..00000000 --- a/tests/bionic/libc/common/test_sem_post.c +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Copyright (C) 2010 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. - */ - -/* This program is used to test that sem_post() will wake up all - * threads that are waiting on a single semaphore, and not all of - * them. - */ - -#include -#include -#include -#include -#include -#include - -static sem_t semaphore; - -/* Thread function, just wait for the semaphore */ -static void* -thread_func(void* arg) -{ - sem_t *psem = (sem_t *)arg; - void *me = (void *)pthread_self(); - printf("thread %p waiting\n", me); - sem_wait(psem); - printf("thread %p exiting\n", me); - return me; -} - -#define MAX_THREADS 50 - -int main(void) -{ - pthread_t t[MAX_THREADS]; - int nn, value; - - /* Initialize to 1, first thread will exit immediately. - * this is used to exercize more of the semaphore code path */ - if ( sem_init( &semaphore, 0, 1 ) < 0 ) { - printf( "Could not initialize semaphore: %s\n", strerror(errno) ); - return 1; - } - - for ( nn = 0; nn < MAX_THREADS; nn++ ) { - if ( pthread_create( &t[nn], NULL, thread_func, &semaphore ) < 0 ) { - printf("Could not create thread %d: %s\n", nn+1, strerror(errno) ); - return 2; - } - } - sleep( 1 ); - - for (nn = 0; nn < MAX_THREADS; nn++) { - sem_post(&semaphore); - } - - for ( nn = 0; nn < MAX_THREADS; nn++) { - void* result; - pthread_join(t[nn], &result); - if (result != (void*)t[nn]) { - printf("Thread %p joined but returned %p\n", (void*)t[nn], result); - } - } - - if (sem_getvalue(&semaphore, &value) < 0) { - printf("Could not get semaphore value: %s\n", strerror(errno)); - return 3; - } - if (value != 1) { - printf("Error: Semaphore value = %d\n", value); - return 4; - } - return 0; -} diff --git a/tests/bionic/libc/common/test_semaphore.c b/tests/bionic/libc/common/test_semaphore.c deleted file mode 100644 index 6792d861..00000000 --- a/tests/bionic/libc/common/test_semaphore.c +++ /dev/null @@ -1,129 +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 -#include -#include -#include -#include -#include -#include - -/* a simple semaphore test, using three threads - * - * a semaphore is initialized with a value of 1 - * - * Thread 1, 2 and 3 start at the same time - * - * Thread 1 takes the semaphore, then sleeps for 2 seconds, then post the semaphore - * Thread 2 sleeps for 1 second, then waits the semaphore, sleeps for 2 seconds, then post the semaphoe - * Thread 3 sleeps 3 seconds, waits for the semaphore - */ - -static sem_t semaphore; - -static void* -_thread1( void* unused ) -{ - printf( "thread 1: waiting for semaphore\n" ); - if ( sem_wait( &semaphore ) < 0 ) { - printf( "thread 1: could not wait for semaphore: %s\n", strerror(errno) ); - return NULL; - } - printf( "thread 1: got the semaphore ! sleeping for 2 seconds\n" ); - sleep( 2 ); - printf( "thread 1: awake !! posting semaphore\n" ); - if ( sem_post( &semaphore ) < 0 ) { - printf( "thread 2: could not post semaphore: %s\n", strerror(errno) ); - } - printf( "thread 1: quitting\n" ); - return NULL; -} - -static void* -_thread2( void* unused ) -{ - printf( "thread 2: sleeping for 1 second\n" ); - sleep(1); - printf( "thread 2: awake !! waiting for semaphore\n" ); - if ( sem_wait( &semaphore ) < 0 ) { - printf( "thread 2: could not wait for semaphore: %s\n", strerror(errno) ); - return NULL; - } - printf( "thread 2: got the semaphore ! sleeping for 2 seconds\n" ); - sleep( 2 ); - printf( "thread 2: awake !! posting semaphore\n" ); - if ( sem_post( &semaphore ) < 0 ) { - printf( "thread 2: could not post semaphore: %s\n", strerror(errno) ); - } - printf( "thread 2: quitting\n" ); - return NULL; -} - - -static void* -_thread3( void* unused ) -{ - printf( "thread 3: sleeping for 3 seconds\n" ); - sleep(3); - printf( "thread 3: awake !! waiting for semaphore\n" ); - if ( sem_wait( &semaphore ) < 0 ) { - printf( "thread 3: could not wait for semaphore: %s\n", strerror(errno) ); - return NULL; - } - printf( "thread 3: got semaphore. quitting\n" ); - return NULL; -} - -typedef void* (*thread_func)(void*); - -static const thread_func thread_routines[] = -{ - &_thread1, - &_thread2, - &_thread3 -}; - -int main( void ) -{ - pthread_t t[3]; - int nn; - - if ( sem_init( &semaphore, 0, 1 ) < 0 ) { - printf( "could not initialize semaphore: %s\n", strerror(errno) ); - return -1; - } - - for ( nn = 0; nn < 3; nn++ ) { - if ( pthread_create( &t[nn], NULL, thread_routines[nn], NULL ) < 0 ) { - printf("could not create thread %d: %s\n", nn+1, strerror(errno) ); - return -2; - } - } - sleep( 5 ); - return 0; -} -- cgit v1.2.3