diff options
Diffstat (limited to '')
27 files changed, 75 insertions, 69 deletions
diff --git a/testsuites/mptests/mp01/system.h b/testsuites/mptests/mp01/system.h index aa2c6d17e4..1a29db3f02 100644 --- a/testsuites/mptests/mp01/system.h +++ b/testsuites/mptests/mp01/system.h @@ -11,11 +11,10 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id$ + * system.h,v 1.2 1995/05/31 17:00:40 joel Exp */ -#include <rtems.h> -#include "tmacros.h" +#include <tmacros.h> /* Miscellaneous */ @@ -25,6 +24,6 @@ /* structures */ -#include "gvar.h" +#include <gvar.h> /* end of include file */ diff --git a/testsuites/mptests/mp02/system.h b/testsuites/mptests/mp02/system.h index aa2c6d17e4..74117b8f9b 100644 --- a/testsuites/mptests/mp02/system.h +++ b/testsuites/mptests/mp02/system.h @@ -11,11 +11,10 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id$ + * system.h,v 1.2 1995/05/31 17:01:00 joel Exp */ -#include <rtems.h> -#include "tmacros.h" +#include <tmacros.h> /* Miscellaneous */ diff --git a/testsuites/mptests/mp03/system.h b/testsuites/mptests/mp03/system.h index aa2c6d17e4..2fa8e248e6 100644 --- a/testsuites/mptests/mp03/system.h +++ b/testsuites/mptests/mp03/system.h @@ -11,11 +11,10 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id$ + * system.h,v 1.2 1995/05/31 17:01:22 joel Exp */ -#include <rtems.h> -#include "tmacros.h" +#include <tmacros.h> /* Miscellaneous */ diff --git a/testsuites/mptests/mp04/system.h b/testsuites/mptests/mp04/system.h index aa2c6d17e4..870bcbe907 100644 --- a/testsuites/mptests/mp04/system.h +++ b/testsuites/mptests/mp04/system.h @@ -11,11 +11,10 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id$ + * system.h,v 1.2 1995/05/31 17:01:40 joel Exp */ -#include <rtems.h> -#include "tmacros.h" +#include <tmacros.h> /* Miscellaneous */ diff --git a/testsuites/mptests/mp05/system.h b/testsuites/mptests/mp05/system.h index aa2c6d17e4..ff93a698c1 100644 --- a/testsuites/mptests/mp05/system.h +++ b/testsuites/mptests/mp05/system.h @@ -11,11 +11,10 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id$ + * system.h,v 1.2 1995/05/31 17:02:00 joel Exp */ -#include <rtems.h> -#include "tmacros.h" +#include <tmacros.h> /* Miscellaneous */ diff --git a/testsuites/mptests/mp06/system.h b/testsuites/mptests/mp06/system.h index 60f2b1a0a2..8c78ceda10 100644 --- a/testsuites/mptests/mp06/system.h +++ b/testsuites/mptests/mp06/system.h @@ -11,11 +11,10 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id$ + * system.h,v 1.2 1995/05/31 17:02:18 joel Exp */ -#include <rtems.h> -#include "tmacros.h" +#include <tmacros.h> /* Miscellaneous */ diff --git a/testsuites/mptests/mp07/system.h b/testsuites/mptests/mp07/system.h index 34ec37a967..a04174d538 100644 --- a/testsuites/mptests/mp07/system.h +++ b/testsuites/mptests/mp07/system.h @@ -11,11 +11,10 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id$ + * system.h,v 1.2 1995/05/31 17:02:38 joel Exp */ -#include <rtems.h> -#include "tmacros.h" +#include <tmacros.h> #define EXTERN extern /* external definition */ diff --git a/testsuites/mptests/mp08/system.h b/testsuites/mptests/mp08/system.h index aa2c6d17e4..df425fa221 100644 --- a/testsuites/mptests/mp08/system.h +++ b/testsuites/mptests/mp08/system.h @@ -11,11 +11,10 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id$ + * system.h,v 1.2 1995/05/31 17:02:55 joel Exp */ -#include <rtems.h> -#include "tmacros.h" +#include <tmacros.h> /* Miscellaneous */ diff --git a/testsuites/mptests/mp09/init.c b/testsuites/mptests/mp09/init.c index bd19547cef..b63a4e0e88 100644 --- a/testsuites/mptests/mp09/init.c +++ b/testsuites/mptests/mp09/init.c @@ -19,7 +19,7 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id$ + * init.c,v 1.2 1995/05/31 17:03:11 joel Exp */ #include "system.h" @@ -49,7 +49,8 @@ rtems_task Init( status = rtems_message_queue_create( Queue_name[ 1 ], 3, - RTEMS_GLOBAL|RTEMS_LIMIT, + 16, + RTEMS_GLOBAL, &Queue_id[ 1 ] ); directive_failed( status, "rtems_message_queue_create" ); diff --git a/testsuites/mptests/mp09/node1/mp09.scn b/testsuites/mptests/mp09/node1/mp09.scn index 2b612e4746..74cf06904d 100644 --- a/testsuites/mptests/mp09/node1/mp09.scn +++ b/testsuites/mptests/mp09/node1/mp09.scn @@ -10,6 +10,7 @@ Receiving message ... Received : abcdefghijklmno Receiving message ... Received : ABCDEFGHIJKLMNO +Receiver delaying for a second rtems_message_queue_send: 123456789012345 Delaying for a second rtems_message_queue_urgent: abcdefghijklmno diff --git a/testsuites/mptests/mp09/node2/mp09.scn b/testsuites/mptests/mp09/node2/mp09.scn index 96708f7fe0..1bd17cecd9 100644 --- a/testsuites/mptests/mp09/node2/mp09.scn +++ b/testsuites/mptests/mp09/node2/mp09.scn @@ -16,12 +16,12 @@ Receiving message ... Received : abcdefghijklmno Receiving message ... Received : ABCDEFGHIJKLMNO +Receiver delaying for a second Flushing remote empty queue -00 messages were flushed on the remote queue +0 messages were flushed on the remote queue Send messages to be flushed from remote queue Flushing remote queue -01 messages were flushed on the remote queue +1 messages were flushed on the remote queue Waiting for message queue to be deleted - Global message queue deleted *** END OF TEST 9 *** diff --git a/testsuites/mptests/mp09/recvmsg.c b/testsuites/mptests/mp09/recvmsg.c index c3c1a8ef8b..7eff6f8af0 100644 --- a/testsuites/mptests/mp09/recvmsg.c +++ b/testsuites/mptests/mp09/recvmsg.c @@ -15,7 +15,7 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id$ + * recvmsg.c,v 1.2 1995/05/31 17:03:14 joel Exp */ #include "system.h" @@ -24,6 +24,7 @@ void Receive_messages() { rtems_status_code status; rtems_unsigned32 index; + rtems_unsigned32 size; char receive_buffer[16]; for ( index=1 ; index <=3 ; index++ ) { @@ -31,6 +32,7 @@ void Receive_messages() status = rtems_message_queue_receive( Queue_id[ 1 ], (long (*)[4])receive_buffer, + &size, RTEMS_DEFAULT_OPTIONS, RTEMS_NO_TIMEOUT ); diff --git a/testsuites/mptests/mp09/sendmsg.c b/testsuites/mptests/mp09/sendmsg.c index d800eb47cf..94e004dfdb 100644 --- a/testsuites/mptests/mp09/sendmsg.c +++ b/testsuites/mptests/mp09/sendmsg.c @@ -15,7 +15,7 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id$ + * sendmsg.c,v 1.2 1995/05/31 17:03:16 joel Exp */ #include "system.h" @@ -28,7 +28,7 @@ void Send_messages() puts_nocr( "rtems_message_queue_send: " ); puts( buffer1 ); - status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer1 ); + status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer1, 16 ); directive_failed( status, "rtems_message_queue_send" ); puts( "Delaying for a second" ); @@ -37,7 +37,7 @@ void Send_messages() puts_nocr( "rtems_message_queue_urgent: " ); puts( buffer2 ); - status = rtems_message_queue_urgent( Queue_id[ 1 ], (long (*)[4])buffer2 ); + status = rtems_message_queue_urgent( Queue_id[ 1 ], (long (*)[4])buffer2, 16 ); directive_failed( status, "rtems_message_queue_urgent" ); puts( "Delaying for a second" ); @@ -49,6 +49,7 @@ void Send_messages() status = rtems_message_queue_broadcast( Queue_id[ 1 ], (long (*)[4])buffer3, + 16, &broadcast_count ); directive_failed( status, "rtems_message_queue_broadcast" ); diff --git a/testsuites/mptests/mp09/system.h b/testsuites/mptests/mp09/system.h index aa2c6d17e4..8b834cda70 100644 --- a/testsuites/mptests/mp09/system.h +++ b/testsuites/mptests/mp09/system.h @@ -11,11 +11,10 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id$ + * system.h,v 1.2 1995/05/31 17:03:17 joel Exp */ -#include <rtems.h> -#include "tmacros.h" +#include <tmacros.h> /* Miscellaneous */ diff --git a/testsuites/mptests/mp09/task1.c b/testsuites/mptests/mp09/task1.c index ece05592dd..cd6cb90041 100644 --- a/testsuites/mptests/mp09/task1.c +++ b/testsuites/mptests/mp09/task1.c @@ -16,7 +16,7 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id$ + * task1.c,v 1.2 1995/05/31 17:03:19 joel Exp */ #include "system.h" @@ -32,6 +32,7 @@ rtems_task Test_task( { rtems_status_code status; rtems_unsigned32 count; + rtems_unsigned32 size; char receive_buffer[16]; status = rtems_task_wake_after( TICKS_PER_SECOND ); @@ -64,21 +65,22 @@ rtems_task Test_task( puts( "Flushing remote empty queue" ); status = rtems_message_queue_flush( Queue_id[ 1 ], &count ); directive_failed( status, "rtems_message_queue_flush" ); - printf( "%02d messages were flushed on the remote queue\n", count ); + printf( "%d messages were flushed on the remote queue\n", count ); puts( "Send messages to be flushed from remote queue" ); - status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer1 ); + status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer1, 16 ); directive_failed( status, "rtems_message_queue_send" ); puts( "Flushing remote queue" ); status = rtems_message_queue_flush( Queue_id[ 1 ], &count ); directive_failed( status, "rtems_message_queue_flush" ); - printf( "%02d messages were flushed on the remote queue\n", count ); + printf( "%d messages were flushed on the remote queue\n", count ); puts( "Waiting for message queue to be deleted" ); status = rtems_message_queue_receive( Queue_id[ 1 ], (long (*)[4])receive_buffer, + &size, RTEMS_DEFAULT_OPTIONS, RTEMS_NO_TIMEOUT ); diff --git a/testsuites/mptests/mp10/init.c b/testsuites/mptests/mp10/init.c index 7acf5ca411..645250dddb 100644 --- a/testsuites/mptests/mp10/init.c +++ b/testsuites/mptests/mp10/init.c @@ -25,7 +25,7 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id$ + * init.c,v 1.2 1995/05/31 17:03:33 joel Exp */ #include "system.h" @@ -58,7 +58,8 @@ rtems_task Init( status = rtems_message_queue_create( Queue_name[ 1 ], 3, - RTEMS_GLOBAL|RTEMS_LIMIT, + 16, + RTEMS_GLOBAL, &Queue_id[ 1 ] ); directive_failed( status, "rtems_message_queue_create" ); diff --git a/testsuites/mptests/mp10/system.h b/testsuites/mptests/mp10/system.h index aa2c6d17e4..43804fb080 100644 --- a/testsuites/mptests/mp10/system.h +++ b/testsuites/mptests/mp10/system.h @@ -11,11 +11,10 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id$ + * system.h,v 1.2 1995/05/31 17:03:35 joel Exp */ -#include <rtems.h> -#include "tmacros.h" +#include <tmacros.h> /* Miscellaneous */ diff --git a/testsuites/mptests/mp10/task1.c b/testsuites/mptests/mp10/task1.c index ff6f4bd69a..984c2ddfd4 100644 --- a/testsuites/mptests/mp10/task1.c +++ b/testsuites/mptests/mp10/task1.c @@ -16,7 +16,7 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id$ + * task1.c,v 1.2 1995/05/31 17:03:37 joel Exp */ #include "system.h" @@ -26,6 +26,7 @@ rtems_task Test_task1( ) { char receive_buffer[16]; + rtems_unsigned32 size; rtems_status_code status; puts( "Getting QID of message queue" ); @@ -42,6 +43,7 @@ rtems_task Test_task1( status = rtems_message_queue_receive( Queue_id[ 1 ], (long (*)[4])receive_buffer, + &size, RTEMS_DEFAULT_OPTIONS, RTEMS_NO_TIMEOUT ); diff --git a/testsuites/mptests/mp11/init.c b/testsuites/mptests/mp11/init.c index df3e4f3abb..1f9f0f68d7 100644 --- a/testsuites/mptests/mp11/init.c +++ b/testsuites/mptests/mp11/init.c @@ -22,7 +22,7 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id$ + * init.c,v 1.2 1995/05/31 17:03:55 joel Exp */ #include "system.h" @@ -69,7 +69,8 @@ rtems_task Init( status = rtems_message_queue_create( Queue_name[ 1 ], 3, - RTEMS_GLOBAL|RTEMS_LIMIT, + 16, + RTEMS_GLOBAL, &junk_id ); fatal_directive_status( diff --git a/testsuites/mptests/mp11/system.h b/testsuites/mptests/mp11/system.h index aa2c6d17e4..6ec1b4186c 100644 --- a/testsuites/mptests/mp11/system.h +++ b/testsuites/mptests/mp11/system.h @@ -11,11 +11,10 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id$ + * system.h,v 1.2 1995/05/31 17:03:57 joel Exp */ -#include <rtems.h> -#include "tmacros.h" +#include <tmacros.h> /* Miscellaneous */ diff --git a/testsuites/mptests/mp12/system.h b/testsuites/mptests/mp12/system.h index aa2c6d17e4..dbb66d2516 100644 --- a/testsuites/mptests/mp12/system.h +++ b/testsuites/mptests/mp12/system.h @@ -11,11 +11,10 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id$ + * system.h,v 1.2 1995/05/31 17:04:13 joel Exp */ -#include <rtems.h> -#include "tmacros.h" +#include <tmacros.h> /* Miscellaneous */ diff --git a/testsuites/mptests/mp13/init.c b/testsuites/mptests/mp13/init.c index 0ec132e9ed..c6411f8106 100644 --- a/testsuites/mptests/mp13/init.c +++ b/testsuites/mptests/mp13/init.c @@ -19,7 +19,7 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id$ + * init.c,v 1.2 1995/05/31 17:04:29 joel Exp */ #include "system.h" @@ -51,7 +51,8 @@ rtems_task Init( status = rtems_message_queue_create( Queue_name[ 1 ], 3, - RTEMS_GLOBAL|RTEMS_LIMIT, + 16, + RTEMS_GLOBAL, &Queue_id[ 1 ] ); directive_failed( status, "rtems_message_queue_create" ); diff --git a/testsuites/mptests/mp13/system.h b/testsuites/mptests/mp13/system.h index aa2c6d17e4..d7ed76d4e0 100644 --- a/testsuites/mptests/mp13/system.h +++ b/testsuites/mptests/mp13/system.h @@ -11,11 +11,10 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id$ + * system.h,v 1.2 1995/05/31 17:04:31 joel Exp */ -#include <rtems.h> -#include "tmacros.h" +#include <tmacros.h> /* Miscellaneous */ diff --git a/testsuites/mptests/mp13/task1.c b/testsuites/mptests/mp13/task1.c index 180d0fd101..95da90f431 100644 --- a/testsuites/mptests/mp13/task1.c +++ b/testsuites/mptests/mp13/task1.c @@ -17,7 +17,7 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id$ + * task1.c,v 1.2 1995/05/31 17:04:33 joel Exp */ #include "system.h" @@ -27,6 +27,7 @@ rtems_task Test_task1( ) { char receive_buffer[16]; + rtems_unsigned32 size; rtems_status_code status; puts( "Getting QID of message queue" ); @@ -44,6 +45,7 @@ rtems_task Test_task1( status = rtems_message_queue_receive( Queue_id[ 1 ], (long (*)[4])receive_buffer, + &size, RTEMS_DEFAULT_OPTIONS, RTEMS_NO_TIMEOUT ); @@ -58,6 +60,7 @@ rtems_task Test_task1( status = rtems_message_queue_receive( Queue_id[ 1 ], (long (*)[4])receive_buffer, + &size, RTEMS_DEFAULT_OPTIONS, 2 * TICKS_PER_SECOND ); diff --git a/testsuites/mptests/mp14/init.c b/testsuites/mptests/mp14/init.c index ab403ad395..d7bc7c9706 100644 --- a/testsuites/mptests/mp14/init.c +++ b/testsuites/mptests/mp14/init.c @@ -19,7 +19,7 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id$ + * init.c,v 1.2 1995/05/31 17:04:55 joel Exp */ #include "system.h" @@ -102,6 +102,7 @@ rtems_task Init( status = rtems_message_queue_create( Queue_name[ 1 ], 1, + 16, RTEMS_GLOBAL, &Queue_id[ 1 ] ); diff --git a/testsuites/mptests/mp14/msgtask1.c b/testsuites/mptests/mp14/msgtask1.c index 2a9f6e235b..a4f9fd4bf7 100644 --- a/testsuites/mptests/mp14/msgtask1.c +++ b/testsuites/mptests/mp14/msgtask1.c @@ -18,7 +18,7 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id$ + * msgtask1.c,v 1.2 1995/05/31 17:04:58 joel Exp */ #include "system.h" @@ -32,6 +32,7 @@ rtems_task Message_queue_task( rtems_unsigned32 yield_count; rtems_unsigned32 *buffer_count; rtems_unsigned32 *overflow_count; + rtems_unsigned32 size; Msg_buffer[ index ][0] = 0; Msg_buffer[ index ][1] = 0; @@ -53,7 +54,8 @@ rtems_task Message_queue_task( if ( Multiprocessing_configuration.node == 1 ) { status = rtems_message_queue_send( Queue_id[ 1 ], - (long (*)[4])Msg_buffer[ index ] + (long (*)[4])Msg_buffer[ index ], + 16 ); directive_failed( status, "rtems_message_queue_send" ); overflow_count = &Msg_buffer[ index ][0]; @@ -70,6 +72,7 @@ rtems_task Message_queue_task( status = rtems_message_queue_receive( Queue_id[ 1 ], (long (*)[4])Msg_buffer[ index ], + &size, RTEMS_DEFAULT_OPTIONS, RTEMS_NO_TIMEOUT ); @@ -83,7 +86,8 @@ rtems_task Message_queue_task( status = rtems_message_queue_send( Queue_id[ 1 ], - (long (*)[4])Msg_buffer[ index ] + (long (*)[4])Msg_buffer[ index ], + 16 ); directive_failed( status, "rtems_message_queue_send" ); diff --git a/testsuites/mptests/mp14/system.h b/testsuites/mptests/mp14/system.h index f2393df080..eaf933a819 100644 --- a/testsuites/mptests/mp14/system.h +++ b/testsuites/mptests/mp14/system.h @@ -11,12 +11,11 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id$ + * system.h,v 1.2 1995/05/31 17:05:03 joel Exp */ -#include <rtems.h> -#include "tmacros.h" -#include "mpci.h" +#include <tmacros.h> +#include <mpci.h> /* Miscellaneous */ |