From f5119be40abdeaea69e0c9ea09d9ca08e870fee3 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 18 Jul 2008 18:47:30 +0000 Subject: 2008-07-18 Joel Sherrill PR 1291/cpukit * psx05/init.c, psxmsgq01/init.c: As part of addressing timeouts and POSIX services taking relative instead of absolute time for timeouts, these tests were updated. --- testsuites/psxtests/ChangeLog | 7 +++++++ testsuites/psxtests/psx05/init.c | 31 ++++++++++++++++++++++++----- testsuites/psxtests/psxmsgq01/init.c | 38 ++++++++++++++++-------------------- 3 files changed, 50 insertions(+), 26 deletions(-) (limited to 'testsuites') diff --git a/testsuites/psxtests/ChangeLog b/testsuites/psxtests/ChangeLog index 25a2c38928..2b78e3defc 100644 --- a/testsuites/psxtests/ChangeLog +++ b/testsuites/psxtests/ChangeLog @@ -1,3 +1,10 @@ +2008-07-18 Joel Sherrill + + PR 1291/cpukit + * psx05/init.c, psxmsgq01/init.c: As part of addressing timeouts and + POSIX services taking relative instead of absolute time for timeouts, + these tests were updated. + 2008-07-17 Joel Sherrill * psxfile01/test.c: truncate on /dev/console now works. diff --git a/testsuites/psxtests/psx05/init.c b/testsuites/psxtests/psx05/init.c index 5ffe5064c2..24936898f7 100644 --- a/testsuites/psxtests/psx05/init.c +++ b/testsuites/psxtests/psx05/init.c @@ -1,5 +1,5 @@ /* - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2008. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -72,6 +72,27 @@ void Print_mutexattr( } } +void calculate_abstimeout( + struct timespec *times, + uint32_t seconds, + uint32_t nanoseconds +) +{ + struct timeval tv1; + struct timezone tz1; + + gettimeofday( &tv1, &tz1 ); + + times->tv_sec = seconds + tv1.tv_sec; + times->tv_nsec = nanoseconds + (tv1.tv_usec * 1000); + + while ( times->tv_nsec >= TOD_NANOSECONDS_PER_SECOND ) { + times->tv_sec++; + times->tv_nsec - TOD_NANOSECONDS_PER_SECOND; + } + +} + void *POSIX_Init( void *argument ) @@ -343,13 +364,13 @@ void *POSIX_Init( printf( "status = %d\n", status ); assert( status == EPERM ); - times.tv_sec = 0; - times.tv_nsec = 500000000; puts( "Init: pthread_mutex_timedlock - time out in 1/2 second" ); + calculate_abstimeout( ×, 0, (TOD_NANOSECONDS_PER_SECOND / 2) ); + status = pthread_mutex_timedlock( &Mutex_id, × ); - if ( status != EAGAIN ) + if ( status != ETIMEDOUT ) printf( "status = %d\n", status ); - assert( status == EAGAIN ); + assert( status == ETIMEDOUT ); /* switch to idle */ diff --git a/testsuites/psxtests/psxmsgq01/init.c b/testsuites/psxtests/psxmsgq01/init.c index f96494f588..ad132a0e43 100644 --- a/testsuites/psxtests/psxmsgq01/init.c +++ b/testsuites/psxtests/psxmsgq01/init.c @@ -744,29 +744,26 @@ void verify_timed_send_queue( int status; char *msg; - timeout.tv_sec = 1; - timeout.tv_nsec = 0; - printf( "Init: mq_timedsend - on queue %s ", Test_q[que].name); len = Predefined_Msgs[MAXMSG].size; msg = Predefined_Msgs[MAXMSG].msg; + gettimeofday( &tv1, &tz1 ); + timeout.tv_sec = tv1.tv_sec + 1; + timeout.tv_nsec = tv1.tv_usec * 1000; + status = mq_timedsend( Test_q[que].mq, msg, len , 0, &timeout ); + gettimeofday( &tv2, &tz2 ); tv3.tv_sec = tv2.tv_sec - tv1.tv_sec; tv3.tv_usec = tv2.tv_usec - tv1.tv_usec; if ( is_blocking ) { /* Don't verify the non-blocking queue */ - fatal_int_service_status( status, -1, "mq_timedsend status"); - fatal_posix_service_status( errno, ETIMEDOUT, "errno ETIMEDOUT"); + fatal_int_service_status( status, -1, "mq_timedsend status" ); + fatal_posix_service_status( errno, ETIMEDOUT, "errno ETIMEDOUT" ); } - printf("Init: %ld sec %ld us\n", (long)tv3.tv_sec, (long)tv3.tv_usec ); - - if ( is_blocking ) /* non-blocking queue */ - assert( tv3.tv_sec == 1 ); - else - assert( tv3.tv_sec == 0 ); + printf( "Init: %ld sec %ld us\n", (long)tv3.tv_sec, (long)tv3.tv_usec ); if ( que == DEFAULT_RW ) Test_q[que].count++; @@ -799,13 +796,18 @@ void verify_timed_receive_queue( struct timezone tz1, tz2; int status; - tm.tv_sec = 1; - tm.tv_nsec = 0; - - printf( "Init: %s mq_timedreceive - on queue %s ", task_name, Test_q[que].name); + printf( + "Init: %s mq_timedreceive - on queue %s ", + task_name, + Test_q[que].name + ); gettimeofday( &tv1, &tz1 ); + tm.tv_sec = tv1.tv_sec + 1; + tm.tv_nsec = tv1.tv_usec * 1000; + status = mq_timedreceive( Test_q[ que ].mq, message, 100, &priority, &tm ); + gettimeofday( &tv2, &tz2 ); tv3.tv_sec = tv2.tv_sec - tv1.tv_sec; tv3.tv_usec = tv2.tv_usec - tv1.tv_usec; @@ -815,14 +817,8 @@ void verify_timed_receive_queue( fatal_posix_service_status( errno, ETIMEDOUT, "errno ETIMEDOUT"); printf( "Init: %ld sec %ld us\n", (long)tv3.tv_sec, (long)tv3.tv_usec ); - if ( is_blocking ) - assert( tv3.tv_sec == 1 ); - else - assert( tv3.tv_sec == 0 ); } - - void verify_timed_receive() { int que; -- cgit v1.2.3