From 5250ff39f042c09503b61eb81a2c705e9b06b917 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 23 Aug 1995 21:06:31 +0000 Subject: Moved _Thread_Information -> _RTEMS_tasks_Information. Added a table of object information control blocks. Modified _Thread_Get so it looks up a thread regardless of which thread management "entity" (manager, internal, etc) actually "owns" it. --- c/src/tests/sptests/sp02/sp02.scn | 4 ++-- c/src/tests/sptests/sp12/sp12.scn | 2 +- c/src/tests/sptests/sp13/sp13.scn | 2 +- c/src/tests/sptests/sp15/sp15.scn | 4 ++-- c/src/tests/sptests/sp16/sp16.scn | 2 +- c/src/tests/sptests/sp20/sp20.scn | 30 +++++++++++++++--------------- c/src/tests/sptests/sp22/sp22.scn | 4 ++-- c/src/tests/sptests/sp23/sp23.scn | 2 +- c/src/tests/sptests/sp23/task1.c | 2 +- c/src/tests/sptests/sp25/sp25.scn | 2 +- c/src/tests/sptests/spsize/size.c | 3 +-- 11 files changed, 28 insertions(+), 29 deletions(-) (limited to 'c/src/tests/sptests') diff --git a/c/src/tests/sptests/sp02/sp02.scn b/c/src/tests/sptests/sp02/sp02.scn index f7ee2c2214..d3f3d61cd1 100644 --- a/c/src/tests/sptests/sp02/sp02.scn +++ b/c/src/tests/sptests/sp02/sp02.scn @@ -5,8 +5,8 @@ INIT - suspending TA2 while middle task on a ready chain TA1 - rtems_task_wake_after - sleep 1 second TA2 - rtems_task_wake_after - sleep 1 minute TA3 - rtems_task_wake_after - sleep 5 seconds -TA1 - rtems_task_ident - tid of TA2 (0x04010007) -TA1 - rtems_task_ident - tid of TA3 (0x04010008) +TA1 - rtems_task_ident - tid of TA2 (0x08010007) +TA1 - rtems_task_ident - tid of TA3 (0x08010008) TA1 - rtems_task_set_priority - set TA3's priority to 2 TA1 - rtems_task_suspend - suspend TA2 TA1 - rtems_task_delete - delete TA2 diff --git a/c/src/tests/sptests/sp12/sp12.scn b/c/src/tests/sptests/sp12/sp12.scn index 08454f9678..3f1bd26b6d 100644 --- a/c/src/tests/sptests/sp12/sp12.scn +++ b/c/src/tests/sptests/sp12/sp12.scn @@ -35,7 +35,7 @@ PRI5 - rtems_semaphore_release - nested PRI5 - rtems_semaphore_release - restore priority PRI5 - priority of PRI5 is 68 -TA1 - rtems_semaphore_ident - smid => 0c010001 +TA1 - rtems_semaphore_ident - smid => 10010001 TA1 - rtems_semaphore_obtain - wait forever on SM2 TA1 - got SM2 TA1 - rtems_semaphore_obtain - wait forever on SM3 diff --git a/c/src/tests/sptests/sp13/sp13.scn b/c/src/tests/sptests/sp13/sp13.scn index 4b842e309f..58eb37d4a9 100644 --- a/c/src/tests/sptests/sp13/sp13.scn +++ b/c/src/tests/sptests/sp13/sp13.scn @@ -1,5 +1,5 @@ *** TEST 13 *** -TA1 - rtems_message_queue_ident - qid => 10010001 +TA1 - rtems_message_queue_ident - qid => 14010001 TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1 TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1 TA1 - rtems_task_wake_after - sleep 5 seconds diff --git a/c/src/tests/sptests/sp15/sp15.scn b/c/src/tests/sptests/sp15/sp15.scn index 34907ccb64..4ae8989215 100644 --- a/c/src/tests/sptests/sp15/sp15.scn +++ b/c/src/tests/sptests/sp15/sp15.scn @@ -1,8 +1,8 @@ *** TEST 15 *** INIT - rtems_partition_create - partition 1 INIT - rtems_partition_create - partition 2 -TA1 - rtems_partition_ident - partition 1 id = 14010001 -TA1 - rtems_partition_ident - partition 2 id = 14010002 +TA1 - rtems_partition_ident - partition 1 id = 18010001 +TA1 - rtems_partition_ident - partition 2 id = 18010002 TA1 - rtems_partition_get_buffer - buffer 1 from partition 1 - 0x00000000 TA1 - rtems_partition_get_buffer - buffer 2 from partition 1 - 0x00000200 TA1 - rtems_partition_get_buffer - buffer 1 from partition 2 - 0x00000000 diff --git a/c/src/tests/sptests/sp16/sp16.scn b/c/src/tests/sptests/sp16/sp16.scn index e586e6e416..cb994c7300 100644 --- a/c/src/tests/sptests/sp16/sp16.scn +++ b/c/src/tests/sptests/sp16/sp16.scn @@ -1,5 +1,5 @@ *** TEST 16 *** -TA1 - rtems_region_ident - rnid => 18010002 +TA1 - rtems_region_ident - rnid => 1c010002 TA1 - rtems_region_get_segment - wait on 100 byte segment from region 2 TA1 - got segment from region 2 - 0x00000f78 TA1 - rtems_region_get_segment - wait on 3K segment from region 3 diff --git a/c/src/tests/sptests/sp20/sp20.scn b/c/src/tests/sptests/sp20/sp20.scn index bf14d1655a..7c948c5469 100644 --- a/c/src/tests/sptests/sp20/sp20.scn +++ b/c/src/tests/sptests/sp20/sp20.scn @@ -1,19 +1,19 @@ *** TEST 20 *** -TA1 - rtems_rate_monotonic_create id = 0x20010001 -TA1 - rtems_rate_monotonic_ident id = 0x20010001 -TA1 - (0x20010001) period 2 -TA2 - rtems_rate_monotonic_create id = 0x20010002 -TA2 - rtems_rate_monotonic_ident id = 0x20010002 -TA2 - (0x20010002) period 2 -TA3 - rtems_rate_monotonic_create id = 0x20010003 -TA3 - rtems_rate_monotonic_ident id = 0x20010003 -TA3 - (0x20010003) period 2 -TA4 - rtems_rate_monotonic_create id = 0x20010004 -TA4 - rtems_rate_monotonic_ident id = 0x20010004 -TA4 - (0x20010004) period 2 -TA5 - rtems_rate_monotonic_create id = 0x20010005 -TA5 - rtems_rate_monotonic_ident id = 0x20010005 -TA5 - (0x20010005) period 100 +TA1 - rtems_rate_monotonic_create id = 0x24010001 +TA1 - rtems_rate_monotonic_ident id = 0x24010001 +TA1 - (0x24010001) period 2 +TA2 - rtems_rate_monotonic_create id = 0x24010002 +TA2 - rtems_rate_monotonic_ident id = 0x24010002 +TA2 - (0x24010002) period 2 +TA3 - rtems_rate_monotonic_create id = 0x24010003 +TA3 - rtems_rate_monotonic_ident id = 0x24010003 +TA3 - (0x24010003) period 2 +TA4 - rtems_rate_monotonic_create id = 0x24010004 +TA4 - rtems_rate_monotonic_ident id = 0x24010004 +TA4 - (0x24010004) period 2 +TA5 - rtems_rate_monotonic_create id = 0x24010005 +TA5 - rtems_rate_monotonic_ident id = 0x24010005 +TA5 - (0x24010005) period 100 TA5 - PERIODS CHECK OK (1) TA5 - PERIODS CHECK OK (2) TA5 - PERIODS CHECK OK (3) diff --git a/c/src/tests/sptests/sp22/sp22.scn b/c/src/tests/sptests/sp22/sp22.scn index e90d0ca36e..8d2acd1867 100644 --- a/c/src/tests/sptests/sp22/sp22.scn +++ b/c/src/tests/sptests/sp22/sp22.scn @@ -1,8 +1,8 @@ *** TEST 22 *** INIT - rtems_timer_create - creating timer 1 -INIT - timer 1 has id (0x8010001) +INIT - timer 1 has id (0xc010001) TA1 - rtems_timer_ident - identing timer 1 -TA1 - timer 1 has id (0x8010001) +TA1 - timer 1 has id (0xc010001) TA1 - rtems_clock_get - 09:00:00 12/31/1988 TA1 - rtems_timer_fire_after - timer 1 in 3 seconds TA1 - rtems_task_suspend( RTEMS_SELF ) diff --git a/c/src/tests/sptests/sp23/sp23.scn b/c/src/tests/sptests/sp23/sp23.scn index 7529abd4c4..70522d79ab 100644 --- a/c/src/tests/sptests/sp23/sp23.scn +++ b/c/src/tests/sptests/sp23/sp23.scn @@ -1,6 +1,6 @@ *** TEST 23 *** INIT - rtems_port_create - DP1 - int = 0x00001000 ext = 0x00002000 -TA1 - rtems_port_ident - 00010001 +TA1 - rtems_port_ident - 0x20010001 TA1 - rtems_port_external_to_internal - 0x0000200e => 0x0000100e TA1 - rtems_port_internal_to_external - 0x0000100e => 0x0000200e TA1 - rtems_port_external_to_internal - 0x0000300e => 0x0000300e diff --git a/c/src/tests/sptests/sp23/task1.c b/c/src/tests/sptests/sp23/task1.c index 5012616131..73ebce778c 100644 --- a/c/src/tests/sptests/sp23/task1.c +++ b/c/src/tests/sptests/sp23/task1.c @@ -33,7 +33,7 @@ rtems_task Task_1( status = rtems_port_ident( Port_name[ 1 ], &dpid ); directive_failed( status, "rtems_port_ident" ); - printf( "TA1 - rtems_port_ident - %08x\n", dpid ); + printf( "TA1 - rtems_port_ident - 0x%08x\n", dpid ); to_be_converted = &External_port_area[ 0xe ]; status = rtems_port_external_to_internal( diff --git a/c/src/tests/sptests/sp25/sp25.scn b/c/src/tests/sptests/sp25/sp25.scn index cec2f084b3..f72da25944 100644 --- a/c/src/tests/sptests/sp25/sp25.scn +++ b/c/src/tests/sptests/sp25/sp25.scn @@ -1,5 +1,5 @@ *** TEST 25 *** -TA1 - rtems_region_ident - 0x18010002 +TA1 - rtems_region_ident - 0x1c010002 TA1 - rtems_region_get_segment - wait on 64 byte segment from region 1 TA1 - got segment from region 1 - 0x0000f9b8 TA1 - rtems_region_get_segment - wait on 128 byte segment from region 1 diff --git a/c/src/tests/sptests/spsize/size.c b/c/src/tests/sptests/spsize/size.c index 012b8570ef..e55fbedb15 100644 --- a/c/src/tests/sptests/spsize/size.c +++ b/c/src/tests/sptests/spsize/size.c @@ -295,7 +295,7 @@ uninitialized = /*taskmp.h*/ 0 + -/*tasks.h*/ 0 + +/*tasks.h*/ (sizeof _RTEMS_tasks_Information) + /*thread.h*/ (sizeof _Thread_Dispatch_disable_level) + (sizeof _Thread_Ticks_remaining_in_timeslice) + @@ -304,7 +304,6 @@ uninitialized = (sizeof _Thread_Executing) + (sizeof _Thread_Heir) + (sizeof _Thread_Allocated_fp) + - (sizeof _Thread_Information) + (sizeof _Thread_BSP_context) + /*threadmp.h*/ (sizeof _Thread_MP_Receive) + -- cgit v1.2.3