From de549c3df9310861ccd4b19ef837bb94565b2290 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 3 Sep 2014 10:16:43 -0500 Subject: Misc psxtmtests: Use uint32_t not long for end_time to match printf() format expectations --- testsuites/psxtmtests/psxtmcond01/init.c | 8 ++++---- testsuites/psxtmtests/psxtmcond02/init.c | 4 ++-- testsuites/psxtmtests/psxtmcond03/init.c | 2 +- testsuites/psxtmtests/psxtmcond04/init.c | 8 ++++---- testsuites/psxtmtests/psxtmcond05/init.c | 4 ++-- testsuites/psxtmtests/psxtmcond06/init.c | 2 +- testsuites/psxtmtests/psxtmcond08/init.c | 2 +- testsuites/psxtmtests/psxtmthread02/init.c | 2 +- testsuites/psxtmtests/psxtmthread04/init.c | 16 ++++++++-------- testsuites/psxtmtests/psxtmthread05/init.c | 3 ++- testsuites/psxtmtests/psxtmthread06/init.c | 2 +- 11 files changed, 27 insertions(+), 26 deletions(-) (limited to 'testsuites/psxtmtests') diff --git a/testsuites/psxtmtests/psxtmcond01/init.c b/testsuites/psxtmtests/psxtmcond01/init.c index 7f1f820be1..c4dd63080c 100644 --- a/testsuites/psxtmtests/psxtmcond01/init.c +++ b/testsuites/psxtmtests/psxtmcond01/init.c @@ -30,8 +30,8 @@ pthread_cond_t mycondvar; void benchmark_create_cond_var(void) { - long end_time; - int status; + uint32_t end_time; + int status; benchmark_timer_initialize(); status = pthread_cond_init(&mycondvar, NULL); @@ -49,8 +49,8 @@ void benchmark_create_cond_var(void) void benchmark_destroy_cond_var(void) { - long end_time; - int status; + uint32_t end_time; + int status; benchmark_timer_initialize(); status = pthread_cond_destroy(&mycondvar); diff --git a/testsuites/psxtmtests/psxtmcond02/init.c b/testsuites/psxtmtests/psxtmcond02/init.c index 7621517fb7..668bb432b9 100644 --- a/testsuites/psxtmtests/psxtmcond02/init.c +++ b/testsuites/psxtmtests/psxtmcond02/init.c @@ -26,8 +26,8 @@ pthread_cond_t CondID; void benchmark_signal(void) { - long end_time; - int status; + uint32_t end_time; + int status; benchmark_timer_initialize(); diff --git a/testsuites/psxtmtests/psxtmcond03/init.c b/testsuites/psxtmtests/psxtmcond03/init.c index f901878578..795c8d4982 100644 --- a/testsuites/psxtmtests/psxtmcond03/init.c +++ b/testsuites/psxtmtests/psxtmcond03/init.c @@ -52,7 +52,7 @@ void *POSIX_Init( { int status; pthread_t threadId; - long end_time; + uint32_t end_time; struct sched_param param; int policy; diff --git a/testsuites/psxtmtests/psxtmcond04/init.c b/testsuites/psxtmtests/psxtmcond04/init.c index eb2823082e..2c16dfa04f 100644 --- a/testsuites/psxtmtests/psxtmcond04/init.c +++ b/testsuites/psxtmtests/psxtmcond04/init.c @@ -33,10 +33,10 @@ void *Blocker( ) { - long end_time; - struct sched_param param; - int policy; - int status; + uint32_t end_time; + struct sched_param param; + int policy; + int status; status = pthread_mutex_lock(&MutexID); rtems_test_assert( status == 0 ); diff --git a/testsuites/psxtmtests/psxtmcond05/init.c b/testsuites/psxtmtests/psxtmcond05/init.c index 1e74c21bc2..ab15fc3a03 100644 --- a/testsuites/psxtmtests/psxtmcond05/init.c +++ b/testsuites/psxtmtests/psxtmcond05/init.c @@ -26,8 +26,8 @@ pthread_cond_t CondID; void benchmark_broadcast(void) { - long end_time; - int status; + uint32_t end_time; + int status; benchmark_timer_initialize(); status = pthread_cond_broadcast(&CondID); diff --git a/testsuites/psxtmtests/psxtmcond06/init.c b/testsuites/psxtmtests/psxtmcond06/init.c index 371792640f..91bef6c5f8 100644 --- a/testsuites/psxtmtests/psxtmcond06/init.c +++ b/testsuites/psxtmtests/psxtmcond06/init.c @@ -52,7 +52,7 @@ void *POSIX_Init( void *argument ) { - long end_time; + uint32_t end_time; int status; int i; pthread_t threadId; diff --git a/testsuites/psxtmtests/psxtmcond08/init.c b/testsuites/psxtmtests/psxtmcond08/init.c index 3da351c266..49ad0d7637 100644 --- a/testsuites/psxtmtests/psxtmcond08/init.c +++ b/testsuites/psxtmtests/psxtmcond08/init.c @@ -50,7 +50,7 @@ void *Low( void *argument ) { - long end_time; + uint32_t end_time; end_time = benchmark_timer_read(); diff --git a/testsuites/psxtmtests/psxtmthread02/init.c b/testsuites/psxtmtests/psxtmthread02/init.c index 4357938ad2..bafa2ac986 100644 --- a/testsuites/psxtmtests/psxtmthread02/init.c +++ b/testsuites/psxtmtests/psxtmthread02/init.c @@ -53,7 +53,7 @@ void *thread( void *argument ) { - long end_time; + uint32_t end_time; end_time = benchmark_timer_read(); put_time( diff --git a/testsuites/psxtmtests/psxtmthread04/init.c b/testsuites/psxtmtests/psxtmthread04/init.c index 28e1833a8a..dc1290c56a 100644 --- a/testsuites/psxtmtests/psxtmthread04/init.c +++ b/testsuites/psxtmtests/psxtmthread04/init.c @@ -26,10 +26,10 @@ void *POSIX_Init(void *argument); void benchmark_pthread_getschedparam(void) { - long end_time; - int status; - int policy; - struct sched_param param; + uint32_t end_time; + int status; + int policy; + struct sched_param param; benchmark_timer_initialize(); status = pthread_getschedparam( pthread_self(), &policy, ¶m ); @@ -48,10 +48,10 @@ void benchmark_pthread_getschedparam(void) void benchmark_pthread_setschedparam(void) { - long end_time; - int status; - int policy; - struct sched_param param; + uint32_t end_time; + int status; + int policy; + struct sched_param param; status = pthread_getschedparam( pthread_self(), &policy, ¶m ); rtems_test_assert( status == 0 ); diff --git a/testsuites/psxtmtests/psxtmthread05/init.c b/testsuites/psxtmtests/psxtmthread05/init.c index 98346b6be6..f127663fab 100644 --- a/testsuites/psxtmtests/psxtmthread05/init.c +++ b/testsuites/psxtmtests/psxtmthread05/init.c @@ -54,7 +54,8 @@ void *test_thread( void *argument ) { - long end_time; + uint32_t end_time; + sched_yield(); end_time = benchmark_timer_read(); diff --git a/testsuites/psxtmtests/psxtmthread06/init.c b/testsuites/psxtmtests/psxtmthread06/init.c index 0a7ee34eeb..3466a8dbc0 100644 --- a/testsuites/psxtmtests/psxtmthread06/init.c +++ b/testsuites/psxtmtests/psxtmthread06/init.c @@ -53,7 +53,7 @@ void *test_thread( void *argument ) { - long end_time; + uint32_t end_time; /* switch to POSIX_Init */ sched_yield(); -- cgit v1.2.3