From add297721052839e5bdcb87dae56f7ffac6c413f Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 19 Oct 2011 15:27:27 +0000 Subject: =?UTF-8?q?2011-10-19=09Ralf=20Cors=C3=A9pius=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * psxtmbarrier01/init.c, psxtmbarrier02/init.c, psxtmbarrier03/init.c, psxtmkey01/init.c, psxtmkey02/init.c, psxtmmq01/init.c, psxtmmutex01/init.c, psxtmmutex02/init.c, psxtmmutex03/init.c, psxtmmutex04/init.c, psxtmmutex05/init.c, psxtmmutex06/init.c, psxtmmutex07/init.c, psxtmnanosleep01/init.c, psxtmnanosleep02/init.c, psxtmrwlock01/init.c, psxtmrwlock02/init.c, psxtmrwlock03/init.c, psxtmrwlock04/init.c, psxtmrwlock05/init.c, psxtmrwlock06/init.c, psxtmrwlock07/init.c, psxtmsem01/init.c, psxtmsem02/init.c, psxtmsem03/init.c, psxtmsem04/init.c, psxtmsem05/init.c, psxtmsleep01/init.c, psxtmsleep02/init.c, psxtmthread03/init.c: Use benchmark_timer_t for benchmark_timer values (Avoid 64bit arch issues). --- testsuites/psxtmtests/ChangeLog | 15 +++++++++++++++ testsuites/psxtmtests/psxtmbarrier01/init.c | 4 ++-- testsuites/psxtmtests/psxtmbarrier02/init.c | 2 +- testsuites/psxtmtests/psxtmbarrier03/init.c | 2 +- testsuites/psxtmtests/psxtmkey01/init.c | 4 ++-- testsuites/psxtmtests/psxtmkey02/init.c | 4 ++-- testsuites/psxtmtests/psxtmmq01/init.c | 20 ++++++++++---------- testsuites/psxtmtests/psxtmmutex01/init.c | 4 ++-- testsuites/psxtmtests/psxtmmutex02/init.c | 2 +- testsuites/psxtmtests/psxtmmutex03/init.c | 10 +++++----- testsuites/psxtmtests/psxtmmutex04/init.c | 2 +- testsuites/psxtmtests/psxtmmutex05/init.c | 2 +- testsuites/psxtmtests/psxtmmutex06/init.c | 2 +- testsuites/psxtmtests/psxtmmutex07/init.c | 4 ++-- testsuites/psxtmtests/psxtmnanosleep01/init.c | 2 +- testsuites/psxtmtests/psxtmnanosleep02/init.c | 2 +- testsuites/psxtmtests/psxtmrwlock01/init.c | 18 +++++++++--------- testsuites/psxtmtests/psxtmrwlock02/init.c | 2 +- testsuites/psxtmtests/psxtmrwlock03/init.c | 2 +- testsuites/psxtmtests/psxtmrwlock04/init.c | 2 +- testsuites/psxtmtests/psxtmrwlock05/init.c | 2 +- testsuites/psxtmtests/psxtmrwlock06/init.c | 2 +- testsuites/psxtmtests/psxtmrwlock07/init.c | 2 +- testsuites/psxtmtests/psxtmsem01/init.c | 14 +++++++------- testsuites/psxtmtests/psxtmsem02/init.c | 10 +++++----- testsuites/psxtmtests/psxtmsem03/init.c | 2 +- testsuites/psxtmtests/psxtmsem04/init.c | 2 +- testsuites/psxtmtests/psxtmsem05/init.c | 2 +- testsuites/psxtmtests/psxtmsleep01/init.c | 2 +- testsuites/psxtmtests/psxtmsleep02/init.c | 2 +- testsuites/psxtmtests/psxtmthread03/init.c | 2 +- 31 files changed, 81 insertions(+), 66 deletions(-) (limited to 'testsuites/psxtmtests') diff --git a/testsuites/psxtmtests/ChangeLog b/testsuites/psxtmtests/ChangeLog index 217c84afd9..5b537ec3c1 100644 --- a/testsuites/psxtmtests/ChangeLog +++ b/testsuites/psxtmtests/ChangeLog @@ -1,3 +1,18 @@ +2011-10-19 Ralf Corsépius + + * psxtmbarrier01/init.c, psxtmbarrier02/init.c, psxtmbarrier03/init.c, + psxtmkey01/init.c, psxtmkey02/init.c, psxtmmq01/init.c, + psxtmmutex01/init.c, psxtmmutex02/init.c, psxtmmutex03/init.c, + psxtmmutex04/init.c, psxtmmutex05/init.c, psxtmmutex06/init.c, + psxtmmutex07/init.c, psxtmnanosleep01/init.c, psxtmnanosleep02/init.c, + psxtmrwlock01/init.c, psxtmrwlock02/init.c, psxtmrwlock03/init.c, + psxtmrwlock04/init.c, psxtmrwlock05/init.c, psxtmrwlock06/init.c, + psxtmrwlock07/init.c, psxtmsem01/init.c, psxtmsem02/init.c, + psxtmsem03/init.c, psxtmsem04/init.c, psxtmsem05/init.c, + psxtmsleep01/init.c, psxtmsleep02/init.c, psxtmthread03/init.c: + Use benchmark_timer_t for benchmark_timer values (Avoid 64bit + arch issues). + 2011-09-29 Ralf Corsépius * psxtmsem03/init.c: Add HAVE_CONFIG_H. diff --git a/testsuites/psxtmtests/psxtmbarrier01/init.c b/testsuites/psxtmtests/psxtmbarrier01/init.c index 5deba788c6..edb9a4c370 100644 --- a/testsuites/psxtmtests/psxtmbarrier01/init.c +++ b/testsuites/psxtmtests/psxtmbarrier01/init.c @@ -22,7 +22,7 @@ pthread_barrier_t barrier; void benchmark_pthread_barrier_init(void) { - long end_time; + benchmark_timer_t end_time; int status; pthread_barrierattr_t attr; @@ -48,7 +48,7 @@ void benchmark_pthread_barrier_init(void) void benchmark_pthread_barrier_destroy(void) { - long end_time; + benchmark_timer_t end_time; int status; benchmark_timer_initialize(); diff --git a/testsuites/psxtmtests/psxtmbarrier02/init.c b/testsuites/psxtmtests/psxtmbarrier02/init.c index be94311c43..74c360df5f 100644 --- a/testsuites/psxtmtests/psxtmbarrier02/init.c +++ b/testsuites/psxtmtests/psxtmbarrier02/init.c @@ -27,7 +27,7 @@ void *Low( void *argument ) { - long end_time; + benchmark_timer_t end_time; /* * Now we have finished the thread startup overhead, diff --git a/testsuites/psxtmtests/psxtmbarrier03/init.c b/testsuites/psxtmtests/psxtmbarrier03/init.c index 14f7d46fa2..908610f0ab 100644 --- a/testsuites/psxtmtests/psxtmbarrier03/init.c +++ b/testsuites/psxtmtests/psxtmbarrier03/init.c @@ -39,7 +39,7 @@ void *POSIX_Init( { int status; pthread_t threadId; - long end_time; + benchmark_timer_t end_time; puts( "\n\n*** POSIX TIME TEST PSXTMBARRIER 03 ***" ); diff --git a/testsuites/psxtmtests/psxtmkey01/init.c b/testsuites/psxtmtests/psxtmkey01/init.c index bdd4fcb345..98c254f2b3 100644 --- a/testsuites/psxtmtests/psxtmkey01/init.c +++ b/testsuites/psxtmtests/psxtmkey01/init.c @@ -23,7 +23,7 @@ pthread_key_t Key; void benchmark_pthread_key_create(void) { - long end_time; + benchmark_timer_t end_time; int status; benchmark_timer_initialize(); @@ -43,7 +43,7 @@ void benchmark_pthread_key_create(void) void benchmark_pthread_key_delete(void) { - long end_time; + benchmark_timer_t end_time; int status; benchmark_timer_initialize(); diff --git a/testsuites/psxtmtests/psxtmkey02/init.c b/testsuites/psxtmtests/psxtmkey02/init.c index fb6c27778d..6dcf311c29 100644 --- a/testsuites/psxtmtests/psxtmkey02/init.c +++ b/testsuites/psxtmtests/psxtmkey02/init.c @@ -24,7 +24,7 @@ int Value1; void benchmark_pthread_setspecific( void *value_p ) { - long end_time; + benchmark_timer_t end_time; int status; benchmark_timer_initialize(); @@ -44,7 +44,7 @@ void benchmark_pthread_setspecific( void *value_p ) void benchmark_pthread_getspecific( void *expected ) { - long end_time; + benchmark_timer_t end_time; void *value_p; benchmark_timer_initialize(); diff --git a/testsuites/psxtmtests/psxtmmq01/init.c b/testsuites/psxtmtests/psxtmmq01/init.c index c647928412..095e4628af 100644 --- a/testsuites/psxtmtests/psxtmmq01/init.c +++ b/testsuites/psxtmtests/psxtmmq01/init.c @@ -30,7 +30,7 @@ const char *q_name; void benchmark_mq_open(int printable) { - long end_time; + benchmark_timer_t end_time; struct mq_attr attr; attr.mq_maxmsg = MQ_MAXMSG; @@ -54,7 +54,7 @@ void benchmark_mq_open(int printable) void benchmark_mq_open_second(int printable) { - long end_time; + benchmark_timer_t end_time; struct mq_attr attr; attr.mq_maxmsg = MQ_MAXMSG; @@ -78,7 +78,7 @@ void benchmark_mq_open_second(int printable) void benchmark_mq_close(int printable) { - long end_time; + benchmark_timer_t end_time; int status; benchmark_timer_initialize(); @@ -98,7 +98,7 @@ void benchmark_mq_close(int printable) void benchmark_mq_close_second(int printable) { - long end_time; + benchmark_timer_t end_time; int status; benchmark_timer_initialize(); @@ -118,7 +118,7 @@ void benchmark_mq_close_second(int printable) void benchmark_mq_unlink(void) { - long end_time; + benchmark_timer_t end_time; int status; benchmark_timer_initialize(); @@ -137,7 +137,7 @@ void benchmark_mq_unlink(void) void benchmark_mq_notify(void) { - long end_time; + benchmark_timer_t end_time; int status; struct sigevent event; @@ -160,7 +160,7 @@ void benchmark_mq_notify(void) void benchmark_mq_send(void) { - long end_time; + benchmark_timer_t end_time; int status; status = 9; @@ -180,7 +180,7 @@ void benchmark_mq_send(void) void benchmark_mq_receive(void) { - long end_time; + benchmark_timer_t end_time; int status; unsigned int priority; int message[MQ_MAXMSG]; @@ -202,7 +202,7 @@ void benchmark_mq_receive(void) void benchmark_mq_timedsend(void) { - long end_time; + benchmark_timer_t end_time; int status; struct timespec timeout; @@ -226,7 +226,7 @@ void benchmark_mq_timedsend(void) void benchmark_mq_timedreceive(void) { - long end_time; + benchmark_timer_t end_time; int status; unsigned int priority; struct timespec timeout; diff --git a/testsuites/psxtmtests/psxtmmutex01/init.c b/testsuites/psxtmtests/psxtmmutex01/init.c index 418f35bcec..5c8baf039e 100644 --- a/testsuites/psxtmtests/psxtmmutex01/init.c +++ b/testsuites/psxtmtests/psxtmmutex01/init.c @@ -23,7 +23,7 @@ pthread_mutex_t MutexId; void test_mutex_create(void) { - long end_time; + benchmark_timer_t end_time; int status; benchmark_timer_initialize(); @@ -42,7 +42,7 @@ void test_mutex_create(void) void test_mutex_destroy(void) { - long end_time; + benchmark_timer_t end_time; int status; benchmark_timer_initialize(); diff --git a/testsuites/psxtmtests/psxtmmutex02/init.c b/testsuites/psxtmtests/psxtmmutex02/init.c index 13dce6a803..358e48cbe7 100644 --- a/testsuites/psxtmtests/psxtmmutex02/init.c +++ b/testsuites/psxtmtests/psxtmmutex02/init.c @@ -27,7 +27,7 @@ void *Low( void *argument ) { - uint32_t end_time; + benchmark_timer_t end_time; /* * Now we have finished the thread startup overhead, diff --git a/testsuites/psxtmtests/psxtmmutex03/init.c b/testsuites/psxtmtests/psxtmmutex03/init.c index e65761b7d6..ea4bcd162a 100644 --- a/testsuites/psxtmtests/psxtmmutex03/init.c +++ b/testsuites/psxtmtests/psxtmmutex03/init.c @@ -23,7 +23,7 @@ pthread_mutex_t MutexId; void benchmark_mutex_lock_available(void) { - long end_time; + benchmark_timer_t end_time; int status; benchmark_timer_initialize(); @@ -42,7 +42,7 @@ void benchmark_mutex_lock_available(void) void benchmark_mutex_unlock_no_threads_waiting(void) { - long end_time; + benchmark_timer_t end_time; int status; benchmark_timer_initialize(); @@ -61,7 +61,7 @@ void benchmark_mutex_unlock_no_threads_waiting(void) void benchmark_mutex_trylock_available(void) { - long end_time; + benchmark_timer_t end_time; int status; benchmark_timer_initialize(); @@ -81,7 +81,7 @@ void benchmark_mutex_trylock_available(void) void benchmark_mutex_trylock_not_available(void) { - long end_time; + benchmark_timer_t end_time; int status; benchmark_timer_initialize(); @@ -105,7 +105,7 @@ void benchmark_mutex_trylock_not_available(void) void benchmark_mutex_timedlock_available(void) { - long end_time; + benchmark_timer_t end_time; int status; benchmark_timer_initialize(); diff --git a/testsuites/psxtmtests/psxtmmutex04/init.c b/testsuites/psxtmtests/psxtmmutex04/init.c index 6d11495654..b65b66dc07 100644 --- a/testsuites/psxtmtests/psxtmmutex04/init.c +++ b/testsuites/psxtmtests/psxtmmutex04/init.c @@ -27,7 +27,7 @@ void *Low( void *argument ) { - uint32_t end_time; + benchmark_timer_t end_time; /* * Now we have finished the thread startup overhead, diff --git a/testsuites/psxtmtests/psxtmmutex05/init.c b/testsuites/psxtmtests/psxtmmutex05/init.c index 28a8b3e381..fe612fdbba 100644 --- a/testsuites/psxtmtests/psxtmmutex05/init.c +++ b/testsuites/psxtmtests/psxtmmutex05/init.c @@ -40,7 +40,7 @@ void *POSIX_Init( { int status; pthread_t threadId; - long end_time; + benchmark_timer_t end_time; puts( "\n\n*** POSIX TIME TEST PSXTMMUTEX05 ***" ); diff --git a/testsuites/psxtmtests/psxtmmutex06/init.c b/testsuites/psxtmtests/psxtmmutex06/init.c index 8bc4c3ddfd..c7aeee69c1 100644 --- a/testsuites/psxtmtests/psxtmmutex06/init.c +++ b/testsuites/psxtmtests/psxtmmutex06/init.c @@ -28,7 +28,7 @@ void *Low( ) { int status; - uint32_t end_time; + benchmark_timer_t end_time; status = pthread_mutex_lock( &MutexId ); end_time = benchmark_timer_read(); diff --git a/testsuites/psxtmtests/psxtmmutex07/init.c b/testsuites/psxtmtests/psxtmmutex07/init.c index 890116fc1e..f50c57d8e7 100644 --- a/testsuites/psxtmtests/psxtmmutex07/init.c +++ b/testsuites/psxtmtests/psxtmmutex07/init.c @@ -23,7 +23,7 @@ pthread_mutex_t MutexId; void test_mutex_setprioceiling(void) { - long end_time; + benchmark_timer_t end_time; int status; int old_ceiling; @@ -43,7 +43,7 @@ void test_mutex_setprioceiling(void) void test_mutex_getprioceiling(void) { - long end_time; + benchmark_timer_t end_time; int status; int current_ceiling; diff --git a/testsuites/psxtmtests/psxtmnanosleep01/init.c b/testsuites/psxtmtests/psxtmnanosleep01/init.c index a8b3af69c5..ba86c96135 100644 --- a/testsuites/psxtmtests/psxtmnanosleep01/init.c +++ b/testsuites/psxtmtests/psxtmnanosleep01/init.c @@ -21,7 +21,7 @@ void *POSIX_Init( void *argument ) { - long end_time; + benchmark_timer_t end_time; struct timespec sleepTime; sleepTime.tv_sec = 0; diff --git a/testsuites/psxtmtests/psxtmnanosleep02/init.c b/testsuites/psxtmtests/psxtmnanosleep02/init.c index acd1380859..25538b762f 100644 --- a/testsuites/psxtmtests/psxtmnanosleep02/init.c +++ b/testsuites/psxtmtests/psxtmnanosleep02/init.c @@ -23,7 +23,7 @@ void *Low( void *argument ) { - long end_time; + benchmark_timer_t end_time; end_time = benchmark_timer_read(); diff --git a/testsuites/psxtmtests/psxtmrwlock01/init.c b/testsuites/psxtmtests/psxtmrwlock01/init.c index 21982ab0cc..37a73e6687 100644 --- a/testsuites/psxtmtests/psxtmrwlock01/init.c +++ b/testsuites/psxtmtests/psxtmrwlock01/init.c @@ -22,7 +22,7 @@ pthread_rwlock_t rwlock; void benchmark_pthread_rwlock_init(void) { - long end_time; + benchmark_timer_t end_time; int status; pthread_rwlockattr_t attr; @@ -44,7 +44,7 @@ void benchmark_pthread_rwlock_init(void) void benchmark_pthread_rwlock_rdlock(void) { - long end_time; + benchmark_timer_t end_time; int status; benchmark_timer_initialize(); @@ -64,7 +64,7 @@ void benchmark_pthread_rwlock_rdlock(void) void benchmark_pthread_rwlock_unlock(int print) { - long end_time; + benchmark_timer_t end_time; int status; benchmark_timer_initialize(); @@ -84,7 +84,7 @@ void benchmark_pthread_rwlock_unlock(int print) void benchmark_pthread_rwlock_tryrdlock(void) { - long end_time; + benchmark_timer_t end_time; int status; benchmark_timer_initialize(); @@ -112,7 +112,7 @@ void benchmark_pthread_rwlock_tryrdlock(void) void benchmark_pthread_rwlock_timedrdlock(void) { - long end_time; + benchmark_timer_t end_time; int status; benchmark_timer_initialize(); @@ -132,7 +132,7 @@ void benchmark_pthread_rwlock_timedrdlock(void) void benchmark_pthread_rwlock_wrlock(void) { - long end_time; + benchmark_timer_t end_time; int status; benchmark_timer_initialize(); @@ -152,7 +152,7 @@ void benchmark_pthread_rwlock_wrlock(void) void benchmark_pthread_rwlock_trywrlock(void) { - long end_time; + benchmark_timer_t end_time; int status; benchmark_timer_initialize(); @@ -181,7 +181,7 @@ void benchmark_pthread_rwlock_trywrlock(void) void benchmark_pthread_rwlock_timedwrlock(void) { - long end_time; + benchmark_timer_t end_time; int status; benchmark_timer_initialize(); @@ -200,7 +200,7 @@ void benchmark_pthread_rwlock_timedwrlock(void) void benchmark_pthread_rwlock_destroy(void) { - long end_time; + benchmark_timer_t end_time; int status; benchmark_timer_initialize(); diff --git a/testsuites/psxtmtests/psxtmrwlock02/init.c b/testsuites/psxtmtests/psxtmrwlock02/init.c index a1b8094223..d7d02b5628 100644 --- a/testsuites/psxtmtests/psxtmrwlock02/init.c +++ b/testsuites/psxtmtests/psxtmrwlock02/init.c @@ -27,7 +27,7 @@ void *Low( void *argument ) { - uint32_t end_time; + benchmark_timer_t end_time; /* * Now we have finished the thread startup overhead, diff --git a/testsuites/psxtmtests/psxtmrwlock03/init.c b/testsuites/psxtmtests/psxtmrwlock03/init.c index b1c5448ff2..f748955bce 100644 --- a/testsuites/psxtmtests/psxtmrwlock03/init.c +++ b/testsuites/psxtmtests/psxtmrwlock03/init.c @@ -28,7 +28,7 @@ void *Low( void *argument ) { - uint32_t end_time; + benchmark_timer_t end_time; /* * Now we have finished the thread startup overhead, diff --git a/testsuites/psxtmtests/psxtmrwlock04/init.c b/testsuites/psxtmtests/psxtmrwlock04/init.c index e6ed27a0e1..49fb540d1d 100644 --- a/testsuites/psxtmtests/psxtmrwlock04/init.c +++ b/testsuites/psxtmtests/psxtmrwlock04/init.c @@ -27,7 +27,7 @@ void *Low( void *argument ) { - uint32_t end_time; + benchmark_timer_t end_time; /* * Now we have finished the thread startup overhead, diff --git a/testsuites/psxtmtests/psxtmrwlock05/init.c b/testsuites/psxtmtests/psxtmrwlock05/init.c index ef9ac03191..7518b32da3 100644 --- a/testsuites/psxtmtests/psxtmrwlock05/init.c +++ b/testsuites/psxtmtests/psxtmrwlock05/init.c @@ -28,7 +28,7 @@ void *Low( void *argument ) { - uint32_t end_time; + benchmark_timer_t end_time; /* * Now we have finished the thread startup overhead, diff --git a/testsuites/psxtmtests/psxtmrwlock06/init.c b/testsuites/psxtmtests/psxtmrwlock06/init.c index 282f917fd5..6c28c1d207 100644 --- a/testsuites/psxtmtests/psxtmrwlock06/init.c +++ b/testsuites/psxtmtests/psxtmrwlock06/init.c @@ -40,7 +40,7 @@ void *POSIX_Init( { int status; pthread_t threadId; - long end_time; + benchmark_timer_t end_time; pthread_rwlockattr_t attr; puts( "\n\n*** POSIX TIME TEST PSXTMRWLOCK 06 ***" ); diff --git a/testsuites/psxtmtests/psxtmrwlock07/init.c b/testsuites/psxtmtests/psxtmrwlock07/init.c index 9c4c48137d..e9a1b69bbd 100644 --- a/testsuites/psxtmtests/psxtmrwlock07/init.c +++ b/testsuites/psxtmtests/psxtmrwlock07/init.c @@ -28,7 +28,7 @@ void *Low( ) { int status; - uint32_t end_time; + benchmark_timer_t end_time; /* write locking */ status = pthread_rwlock_wrlock(&rwlock); diff --git a/testsuites/psxtmtests/psxtmsem01/init.c b/testsuites/psxtmtests/psxtmsem01/init.c index d3c489cd3f..490d612b00 100644 --- a/testsuites/psxtmtests/psxtmsem01/init.c +++ b/testsuites/psxtmtests/psxtmsem01/init.c @@ -29,7 +29,7 @@ sem_t *n_sem2; void benchmark_sem_init(void) { - long end_time; + benchmark_timer_t end_time; int status; benchmark_timer_initialize(); @@ -48,7 +48,7 @@ void benchmark_sem_init(void) void benchmark_sem_destroy(void) { - long end_time; + benchmark_timer_t end_time; int status; benchmark_timer_initialize(); @@ -67,7 +67,7 @@ void benchmark_sem_destroy(void) void benchmark_sem_open(bool report_time) { - long end_time; + benchmark_timer_t end_time; benchmark_timer_initialize(); n_sem1 = sem_open( "sem1", O_CREAT, 0777, 1 ); @@ -86,7 +86,7 @@ void benchmark_sem_open(bool report_time) void benchmark_sem_close(bool report_time) { - long end_time; + benchmark_timer_t end_time; int status; benchmark_timer_initialize(); @@ -107,7 +107,7 @@ void benchmark_sem_close(bool report_time) void benchmark_sem_unlink(const char *message) { - long end_time; + benchmark_timer_t end_time; int status; benchmark_timer_initialize(); @@ -126,7 +126,7 @@ void benchmark_sem_unlink(const char *message) void benchmark_sem_open_second(void) { - long end_time; + benchmark_timer_t end_time; benchmark_timer_initialize(); n_sem2 = sem_open( "sem1", O_EXCL, 0777, 1 ); @@ -143,7 +143,7 @@ void benchmark_sem_open_second(void) void benchmark_sem_close_second(void) { - long end_time; + benchmark_timer_t end_time; int status; benchmark_timer_initialize(); diff --git a/testsuites/psxtmtests/psxtmsem02/init.c b/testsuites/psxtmtests/psxtmsem02/init.c index 8aedde2757..baddc44fa0 100644 --- a/testsuites/psxtmtests/psxtmsem02/init.c +++ b/testsuites/psxtmtests/psxtmsem02/init.c @@ -26,7 +26,7 @@ sem_t *n_sem1; void benchmark_sem_getvalue(void) { - long end_time; + benchmark_timer_t end_time; int status; int value; @@ -46,7 +46,7 @@ void benchmark_sem_getvalue(void) void benchmark_sem_wait(void) { - long end_time; + benchmark_timer_t end_time; int status; benchmark_timer_initialize(); @@ -65,7 +65,7 @@ void benchmark_sem_wait(void) void benchmark_sem_post(void) { - long end_time; + benchmark_timer_t end_time; int status; benchmark_timer_initialize(); @@ -84,7 +84,7 @@ void benchmark_sem_post(void) void benchmark_sem_trywait_available(void) { - long end_time; + benchmark_timer_t end_time; int status; benchmark_timer_initialize(); @@ -103,7 +103,7 @@ void benchmark_sem_trywait_available(void) void benchmark_sem_trywait_not_available(void) { - long end_time; + benchmark_timer_t end_time; int status; benchmark_timer_initialize(); diff --git a/testsuites/psxtmtests/psxtmsem03/init.c b/testsuites/psxtmtests/psxtmsem03/init.c index ff8e7ef105..07e45d9d69 100644 --- a/testsuites/psxtmtests/psxtmsem03/init.c +++ b/testsuites/psxtmtests/psxtmsem03/init.c @@ -31,7 +31,7 @@ void *Low( void *argument ) { - long end_time; + benchmark_timer_t end_time; /* * Now we have finished the thread startup overhead, diff --git a/testsuites/psxtmtests/psxtmsem04/init.c b/testsuites/psxtmtests/psxtmsem04/init.c index cfce77c603..468fd476bf 100644 --- a/testsuites/psxtmtests/psxtmsem04/init.c +++ b/testsuites/psxtmtests/psxtmsem04/init.c @@ -42,7 +42,7 @@ void *POSIX_Init(void *argument) { int status; pthread_t threadId; - long end_time; + benchmark_timer_t end_time; puts( "\n\n*** POSIX TIME TEST SEMAPHORE 04 ***" ); diff --git a/testsuites/psxtmtests/psxtmsem05/init.c b/testsuites/psxtmtests/psxtmsem05/init.c index 769c141623..4b84fed027 100644 --- a/testsuites/psxtmtests/psxtmsem05/init.c +++ b/testsuites/psxtmtests/psxtmsem05/init.c @@ -33,7 +33,7 @@ void *Low( ) { int status; - uint32_t end_time; + benchmark_timer_t end_time; status = sem_wait(&sem1); /* semaphore blocks */ end_time = benchmark_timer_read(); diff --git a/testsuites/psxtmtests/psxtmsleep01/init.c b/testsuites/psxtmtests/psxtmsleep01/init.c index 37ec5576ff..dc0d0a9488 100644 --- a/testsuites/psxtmtests/psxtmsleep01/init.c +++ b/testsuites/psxtmtests/psxtmsleep01/init.c @@ -23,7 +23,7 @@ void *POSIX_Init( void *argument ) { - long end_time; + benchmark_timer_t end_time; puts( "\n\n*** POSIX TIME TEST PSXTMSLEEP01 ***" ); diff --git a/testsuites/psxtmtests/psxtmsleep02/init.c b/testsuites/psxtmtests/psxtmsleep02/init.c index ebd5a419fe..16aa4fe496 100644 --- a/testsuites/psxtmtests/psxtmsleep02/init.c +++ b/testsuites/psxtmtests/psxtmsleep02/init.c @@ -23,7 +23,7 @@ void *Low( void *argument ) { - long end_time; + benchmark_timer_t end_time; end_time = benchmark_timer_read(); diff --git a/testsuites/psxtmtests/psxtmthread03/init.c b/testsuites/psxtmtests/psxtmthread03/init.c index 2b1f0e7c1e..7ecc33eaeb 100644 --- a/testsuites/psxtmtests/psxtmthread03/init.c +++ b/testsuites/psxtmtests/psxtmthread03/init.c @@ -25,7 +25,7 @@ void *Low( void *argument ) { - uint32_t end_time; + benchmark_timer_t end_time; /* * Now we have finished the thread startup overhead, -- cgit v1.2.3