diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Bmakefile | 5 | ||||
| -rw-r--r-- | tests/ChangeLog | 4 | ||||
| -rw-r--r-- | tests/GNUmakefile | 6 | ||||
| -rw-r--r-- | tests/Makefile | 5 | ||||
| -rw-r--r-- | tests/Wmakefile | 5 | ||||
| -rw-r--r-- | tests/once3.c | 114 | 
6 files changed, 131 insertions, 8 deletions
| diff --git a/tests/Bmakefile b/tests/Bmakefile index 294eec1..924ea06 100644 --- a/tests/Bmakefile +++ b/tests/Bmakefile @@ -31,7 +31,7 @@  #      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  #
 -DLL_VER	= 1
 +DLL_VER	= 2
  CP	= copy
  RM	= erase
 @@ -91,7 +91,7 @@ PASSES=   loadfree.pass \  	  mutex6s.pass  mutex6es.pass  mutex6rs.pass  \
  	  mutex7.pass  mutex7n.pass  mutex7e.pass  mutex7r.pass  \
  	  mutex8.pass  mutex8n.pass  mutex8e.pass  mutex8r.pass  \
 -	  count1.pass  once1.pass  once2.pass  tsd1.pass  \
 +	  count1.pass  once1.pass  once2.pass  once3.pass  tsd1.pass  \
  	  self2.pass  \
  	  cancel1.pass  cancel2.pass  \
  	  semaphore4.pass  semaphore4t.pass  \
 @@ -307,6 +307,7 @@ mutex8e.pass: mutex7e.pass  mutex8r.pass: mutex7r.pass
  once1.pass: create1.pass
  once2.pass: once1.pass
 +once3.pass: once2.pass
  priority1.pass: join1.pass
  priority2.pass: priority1.pass barrier3.pass
  reuse1.pass: create2.pass
 diff --git a/tests/ChangeLog b/tests/ChangeLog index cea9444..321adc3 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,7 @@ +2005-03-12  Ross Johnson  <rpj@callisto.canberra.edu.au> + +	* once3.c: New test. +  2005-03-08  Ross Johnson  <rpj@callisto.canberra.edu.au>          * once2.c: New test. diff --git a/tests/GNUmakefile b/tests/GNUmakefile index 6bf0546..b8b1c91 100644 --- a/tests/GNUmakefile +++ b/tests/GNUmakefile @@ -31,7 +31,7 @@  #      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA  # -DLL_VER	= 1 +DLL_VER	= 2  CP	= cp -f  MV	= mv -f @@ -74,6 +74,7 @@ COPYFILES	= $(HDR) $(LIB) $(DLL) $(QAPC)  # If a test case returns a non-zero exit code to the shell, make will  # stop. +XTESTS	= once3   TESTS	= sizes loadfree \  	  self1 mutex5 mutex1 mutex1e mutex1n mutex1r \  	  semaphore1 semaphore2 semaphore3 \ @@ -86,7 +87,7 @@ TESTS	= sizes loadfree \  	  mutex4 mutex6 mutex6n mutex6e mutex6r \  	  mutex6s mutex6es mutex6rs \  	  mutex7 mutex7n mutex7e mutex7r mutex8 mutex8n mutex8e mutex8r \ -	  count1 once1 once2 tsd1 self2 \ +	  count1 once1 once2 once3 tsd1 self2 \  	  cancel1 cancel2 \  	  semaphore4 semaphore4t \  	  delay1 delay2 eyal1 \ @@ -238,6 +239,7 @@ mutex8e.pass: mutex7e.pass  mutex8r.pass: mutex7r.pass  once1.pass: create1.pass  once2.pass: once1.pass +once3.pass: once2.pass  priority1.pass: join1.pass  priority2.pass: priority1.pass barrier3.pass  reuse1.pass: create2.pass diff --git a/tests/Makefile b/tests/Makefile index cad2a94..3b75670 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -31,7 +31,7 @@  #      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  #
 -DLL_VER	= 1
 +DLL_VER	= 2
  CP	= copy
  RM	= erase
 @@ -95,7 +95,7 @@ PASSES= sizes.pass  loadfree.pass \  	  mutex6s.pass  mutex6es.pass  mutex6rs.pass  \
  	  mutex7.pass  mutex7n.pass  mutex7e.pass  mutex7r.pass  \
  	  mutex8.pass  mutex8n.pass  mutex8e.pass  mutex8r.pass  \
 -	  count1.pass  once1.pass  once2.pass  tsd1.pass  \
 +	  count1.pass  once1.pass  once2.pass  once3.pass  tsd1.pass  \
  	  self2.pass  \
  	  cancel1.pass  cancel2.pass  \
  	  semaphore4.pass  semaphore4t.pass  \
 @@ -319,6 +319,7 @@ mutex8e.pass: mutex7e.pass  mutex8r.pass: mutex7r.pass
  once1.pass: create1.pass
  once2.pass: once1.pass
 +once3.pass: once2.pass
  priority1.pass: join1.pass
  priority2.pass: priority1.pass barrier3.pass
  reuse1.pass: create2.pass
 diff --git a/tests/Wmakefile b/tests/Wmakefile index 91a4854..ff54700 100644 --- a/tests/Wmakefile +++ b/tests/Wmakefile @@ -32,7 +32,7 @@  #
 -DLL_VER	= 1
 +DLL_VER	= 2
  .EXTENSIONS:
 @@ -91,7 +91,7 @@ PASSES	= sizes.pass  loadfree.pass &  	  mutex6s.pass  mutex6es.pass  mutex6rs.pass  &
  	  mutex7.pass  mutex7n.pass  mutex7e.pass  mutex7r.pass  &
  	  mutex8.pass  mutex8n.pass  mutex8e.pass  mutex8r.pass  &
 -	  count1.pass  once1.pass  once2.pass  tsd1.pass  &
 +	  count1.pass  once1.pass  once2.pass  once3.pass  tsd1.pass  &
  	  self2.pass  &
  	  cancel1.pass  cancel2.pass  &
  	  semaphore4.pass semaphore4t.pass  &
 @@ -304,6 +304,7 @@ mutex8e.pass: mutex7e.pass  mutex8r.pass: mutex7r.pass
  once1.pass: create1.pass
  once2.pass: once1.pass
 +once3.pass: once2.pass
  priority1.pass: join1.pass
  priority2.pass: priority1.pass barrier3.pass
  reuse1.pass: create2.pass
 diff --git a/tests/once3.c b/tests/once3.c new file mode 100644 index 0000000..fabed51 --- /dev/null +++ b/tests/once3.c @@ -0,0 +1,114 @@ +/* + * once3.c + * + * + * -------------------------------------------------------------------------- + * + *      Pthreads-win32 - POSIX Threads Library for Win32 + *      Copyright(C) 1998 John E. Bossom + *      Copyright(C) 1999,2005 Pthreads-win32 contributors + *  + *      Contact Email: rpj@callisto.canberra.edu.au + *  + *      The current list of contributors is contained + *      in the file CONTRIBUTORS included with the source + *      code distribution. The list can also be seen at the + *      following World Wide Web location: + *      http://sources.redhat.com/pthreads-win32/contributors.html + *  + *      This library is free software; you can redistribute it and/or + *      modify it under the terms of the GNU Lesser General Public + *      License as published by the Free Software Foundation; either + *      version 2 of the License, or (at your option) any later version. + *  + *      This library is distributed in the hope that it will be useful, + *      but WITHOUT ANY WARRANTY; without even the implied warranty of + *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU + *      Lesser General Public License for more details. + *  + *      You should have received a copy of the GNU Lesser General Public + *      License along with this library in the file COPYING.LIB; + *      if not, write to the Free Software Foundation, Inc., + *      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * -------------------------------------------------------------------------- + * + * Create several pthread_once objects and channel several threads + * through each. Make the init_routine cancelable and cancel them + * waiters waiting. + * + * Depends on API functions: + *	pthread_once() + *	pthread_create() + *      pthread_testcancel() + *      pthread_cancel() + *      pthread_once() + */ + +#include "test.h" + +#define NUM_THREADS 100 /* Targeting each once control */ +#define NUM_ONCE    10 + +pthread_once_t o = PTHREAD_ONCE_INIT; +pthread_once_t once[NUM_ONCE]; + +static int numOnce = 0; +static int numThreads = 0; + +void +myfunc(void) +{ +  numOnce++; +  /* Simulate slow once routine so that following threads pile up behind it */ +  Sleep(10); +  /* test for cancelation late so we're sure to have waiters. */ +  pthread_testcancel(); +} + +void * +mythread(void * arg) +{ +  /* +   * Cancel every thread. These threads are deferred cancelable only, so +   * only the thread performing the init_routine will see it (there are +   * no other cancelation points here). The result will be that every thread +   * eventually cancels only when it becomes the new initter. +   */ +  pthread_cancel(pthread_self()); +  assert(pthread_once(&once[(int) arg], myfunc) == 0); +  numThreads++; +  return 0; +} + +int +main() +{ +  pthread_t t[NUM_THREADS][NUM_ONCE]; +  int i, j; +   +  for (j = 0; j < NUM_ONCE; j++) +    { +      once[j] = o; + +      for (i = 0; i < NUM_THREADS; i++) +        { +          assert(pthread_create(&t[i][j], NULL, mythread, (void *) j) == 0); +        } +    } + +  for (j = 0; j < NUM_ONCE; j++) +    for (i = 0; i < NUM_THREADS; i++) +      if (pthread_join(t[i][j], NULL) != 0) +        printf("Join failed for [thread,once] = [%d,%d]\n", i, j); + +  /* +   * All threads will cancel, none will return normally from +   * pthread_once and so numThreads should never be incremented. However, +   * numOnce should be incremented by every thread (NUM_THREADS*NUM_ONCE). +   */ +  assert(numOnce == NUM_ONCE * NUM_THREADS); +  assert(numThreads == 0); + +  return 0; +} | 
