* winsup.api/pthread/condvar7.c (mythread): Cast
pthread_mutex_unlock argument of pthread_cleanup_push to void *, preventing a compiler warning / testsuite failure. * winsup.api/pthread/condvar9.c (mythread): Likewise. * winsup.api/pthread/rwlock7.c (main): Use ftime instead of _ftime.
This commit is contained in:
parent
921587de50
commit
9b15aa7559
winsup/testsuite
|
@ -1,3 +1,12 @@
|
||||||
|
2003-03-27 Brian Ford <ford@vss.fsi.com>
|
||||||
|
|
||||||
|
* winsup.api/pthread/condvar7.c (mythread): Cast
|
||||||
|
pthread_mutex_unlock argument of pthread_cleanup_push
|
||||||
|
to void *, preventing a compiler warning / testsuite failure.
|
||||||
|
* winsup.api/pthread/condvar9.c (mythread): Likewise.
|
||||||
|
* winsup.api/pthread/rwlock7.c (main): Use ftime instead of
|
||||||
|
_ftime.
|
||||||
|
|
||||||
2003-03-18 Thomas Pfaff <tpfaff@gmx.net>
|
2003-03-18 Thomas Pfaff <tpfaff@gmx.net>
|
||||||
|
|
||||||
* winsup.api/pthread/rwlock1.c: New test.
|
* winsup.api/pthread/rwlock1.c: New test.
|
||||||
|
|
|
@ -97,7 +97,7 @@ mythread(void * arg)
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#pragma inline_depth(0)
|
#pragma inline_depth(0)
|
||||||
#endif
|
#endif
|
||||||
pthread_cleanup_push(pthread_mutex_unlock, (void *) &cvthing.lock);
|
pthread_cleanup_push((void *) pthread_mutex_unlock, (void *) &cvthing.lock);
|
||||||
|
|
||||||
while (! (cvthing.shared > 0))
|
while (! (cvthing.shared > 0))
|
||||||
assert(pthread_cond_timedwait(&cvthing.notbusy, &cvthing.lock, &abstime) == 0);
|
assert(pthread_cond_timedwait(&cvthing.notbusy, &cvthing.lock, &abstime) == 0);
|
||||||
|
|
|
@ -102,7 +102,7 @@ mythread(void * arg)
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#pragma inline_depth(0)
|
#pragma inline_depth(0)
|
||||||
#endif
|
#endif
|
||||||
pthread_cleanup_push(pthread_mutex_unlock, (void *) &cvthing.lock);
|
pthread_cleanup_push((void *) pthread_mutex_unlock, (void *) &cvthing.lock);
|
||||||
|
|
||||||
while (! (cvthing.shared > 0))
|
while (! (cvthing.shared > 0))
|
||||||
assert(pthread_cond_timedwait(&cvthing.notbusy, &cvthing.lock, &abstime) == 0);
|
assert(pthread_cond_timedwait(&cvthing.notbusy, &cvthing.lock, &abstime) == 0);
|
||||||
|
|
|
@ -131,7 +131,7 @@ main (int argc, char *argv[])
|
||||||
assert(pthread_rwlock_init (&data[data_count].lock, NULL) == 0);
|
assert(pthread_rwlock_init (&data[data_count].lock, NULL) == 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
_ftime(&currSysTime1);
|
ftime(&currSysTime1);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Create THREADS threads to access shared data.
|
* Create THREADS threads to access shared data.
|
||||||
|
@ -177,7 +177,7 @@ main (int argc, char *argv[])
|
||||||
printf ("%d thread updates, %d data updates\n",
|
printf ("%d thread updates, %d data updates\n",
|
||||||
thread_updates, data_updates);
|
thread_updates, data_updates);
|
||||||
|
|
||||||
_ftime(&currSysTime2);
|
ftime(&currSysTime2);
|
||||||
|
|
||||||
printf( "\nstart: %ld/%d, stop: %ld/%d, duration:%ld\n",
|
printf( "\nstart: %ld/%d, stop: %ld/%d, duration:%ld\n",
|
||||||
currSysTime1.time,currSysTime1.millitm,
|
currSysTime1.time,currSysTime1.millitm,
|
||||||
|
|
Loading…
Reference in New Issue