diff options
| author | rpj <rpj> | 2001-02-10 08:35:29 +0000 |
|---|---|---|
| committer | rpj <rpj> | 2001-02-10 08:35:29 +0000 |
| commit | 1c38dfed3806cf142ebb0b1be473c88c5b2ac929 (patch) | |
| tree | 0fa36b935802dfcfb1d4dfd28b3e3d791e49bc8d /tests | |
| parent | 1648c7a97f27d10ad302c6141562ece01065e1d7 (diff) | |
2001-02-09 Ross Johnson <rpj@setup1.ise.canberra.edu.au>exp-2001-02-10-passed
* nonportable.c (pthread_mutex_setdefaulttype_np): New
function for changing the default mutex type.
* mutex.c (ptw32_InitializeCriticalSection): Removed.
(ptw32_InitializeCriticalSection): Removed.
(ptw32_InitializeCriticalSection): Removed.
(ptw32_InitializeCriticalSection): Removed.
(ptw32_InitializeCriticalSection): Removed.
(pthread_mutex_init): Apply Thomas Pfaff's original
patches; remove use of critical sections and adapt
for different mutex types (see log entry for 2001-01-10).
The disadvantage of using critical sections is that
they don't appear to be sharable between processes.
This implementation provides the opportunity to place
mutex objects in shared memory. Thread priority
determines the order in which waiting threads acquire
the mutex although the implementation includes a
mechanism to prevent threads hogging the mutex through
successive unlock/lock operations.
(pthread_mutex_destroy): Likewise.
(pthread_mutex_lock): Likewise.
(pthread_mutex_unlock): Likewise.
(pthread_mutex_trylock): Likewise.
* pthread.h (rand_r): Add redundant test of '_seed' arg
to avoid "unused variable" warnings. Any good compiler
will optimise the test away anyway.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/cancel2.c | 5 | ||||
| -rw-r--r-- | tests/rwlock7.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/tests/cancel2.c b/tests/cancel2.c index 3a7c2c5..f1b5106 100644 --- a/tests/cancel2.c +++ b/tests/cancel2.c @@ -138,6 +138,7 @@ main() { int failed = 0; int i; + int ret; pthread_t t[NUMTHREADS + 1]; assert((t[0] = pthread_self()) != NULL); @@ -155,7 +156,9 @@ main() */ Sleep(500); - assert(pthread_mutex_unlock(&waitLock) == 0); + ret = pthread_mutex_unlock(&waitLock); + assert(ret != EPERM); + assert(ret == 0); Sleep(500); diff --git a/tests/rwlock7.c b/tests/rwlock7.c index cf20bfd..ff2db21 100644 --- a/tests/rwlock7.c +++ b/tests/rwlock7.c @@ -10,7 +10,7 @@ #define THREADS 5 #define DATASIZE 15 -#define ITERATIONS 10000 +#define ITERATIONS 1000000 /* * Keep statistics for each thread. @@ -162,7 +162,7 @@ main (int argc, char *argv[]) _ftime(&currSysTime2); - printf( "\nstart: %d/%d, stop: %d/%d, duration:%d\n", + printf( "\nstart: %ld/%d, stop: %ld/%d, duration:%ld\n", currSysTime1.time,currSysTime1.millitm, currSysTime2.time,currSysTime2.millitm, (currSysTime2.time*1000+currSysTime2.millitm) - |