summaryrefslogtreecommitdiffstats
path: root/c/src/ada-tests/sptests/sp16
diff options
context:
space:
mode:
Diffstat (limited to 'c/src/ada-tests/sptests/sp16')
-rw-r--r--c/src/ada-tests/sptests/sp16/sp16.scn48
-rw-r--r--c/src/ada-tests/sptests/sp16/sptest.adb116
-rw-r--r--c/src/ada-tests/sptests/sp16/sptest.ads7
3 files changed, 146 insertions, 25 deletions
diff --git a/c/src/ada-tests/sptests/sp16/sp16.scn b/c/src/ada-tests/sptests/sp16/sp16.scn
index 3e3f314b67..928dc4a9cf 100644
--- a/c/src/ada-tests/sptests/sp16/sp16.scn
+++ b/c/src/ada-tests/sptests/sp16/sp16.scn
@@ -1,48 +1,58 @@
*** TEST 16 ***
TA1 - region_ident - rnid => 16#32010001#
TA1 - region_get_segment - wait on 100 byte segment from region 2
-TA1 - got segment from region 2 - 16#30#
+TA1 - got segment from region 2 - 16#70#
TA1 - region_get_segment - wait on 3K segment from region 3
-TA1 - got segment from region 3 - 16#30#
+TA1 - got segment from region 3 - 16#70#
TA1 - region_get_segment - get 3080 byte segment from region 1 - NO_WAIT
-TA1 - got segment from region 1 - 16#20#
+TA1 - got segment from region 1 - 16#60#
TA1 - task_wake_after - yield processor
TA2 - region_get_segment - wait on 2K segment from region 1
TA3 - region_get_segment - wait on 3950 byte segment from region 2
<pause>
-TA1 - region_return_segment - return segment to region 1 - 16#20#
+TA1 - region_return_segment - return segment to region 1 - 16#60#
TA1 - region_get_segment - wait 10 seconds for 3K segment from region 1
-TA2 - got segment from region 1 - 16#20#
-TA2 - region_return_segment - return segment to region 1 - 16#20#
+TA2 - got segment from region 1 - 16#60#
+TA2 - region_return_segment - return segment to region 1 - 16#60#
TA2 - task_set_priority - make self highest priority task
TA2 - region_get_segment - wait on 3950 byte segment from region 2
-TA1 - got segment from region 1 - 16#20#
-TA1 - region_return_segment - return segment to region 2 - 16#30#
-TA2 - got segment from region 2 - 16#30#
-TA2 - region_return_segment - return segment to region 2 - 16#30#
+TA1 - got segment from region 1 - 16#60#
+TA1 - region_return_segment - return segment to region 2 - 16#70#
+TA2 - got segment from region 2 - 16#70#
+TA2 - region_return_segment - return segment to region 2 - 16#70#
TA2 - task_delete - delete self
TA1 - task_wake_after - yield processor
-TA3 - got segment from region 2 - 16#30#
+TA3 - got segment from region 2 - 16#70#
TA3 - region_get_segment - wait on 2K segment from region 3
TA1 - task_delete - delete TA3
<pause>
TA1 - task_wake_after - yield processor
TA4 - region_get_segment - wait on 1.5K segment from region 1
TA5 - region_get_segment - wait on 1.5K segment from region 1
-TA1 - region_return_segment - return segment to region 1 - 16#20#
+TA1 - region_return_segment - return segment to region 1 - 16#60#
TA1 - task_wake_after - yield processor
-TA4 - got and returned 16#20#
-TA5 - got and returned 16#6A0#
+TA4 - got and returned 16#60#
+TA5 - got and returned 16#6E0#
TA1 - region_get_segment - wait 10 seconds for 3K segment from region 1
-TA1 - got segment from region 1 - 16#20#
-TA1 - task_wake_after - sleep 1 second
+TA1 - got segment from region 1 - 16#60#
+TA1 - task_wake_after - yield processor
TA5 - region_get_segment - wait on 3K segment from region 1
TA4 - region_get_segment - wait on 3K segment from region 1
TA1 - task_delete - delete TA4
-TA1 - region_return_segment - return segment to region 1 - 16#20#
+TA1 - region_return_segment - return segment to region 1 - 16#60#
TA1 - task_wake_after - yield processor
-TA5 - got segment from region 1 - 16#20#
-TA5 - region_return_segment - return segment to region 1 - 16#20#
+TA5 - got segment from region 1 - 16#60#
+TA5 - region_return_segment - return segment to region 1 - 16#60#
TA5 - task_delete - delete self
TA1 - region_delete - delete region 1
+TA1 - region_get_segment - get 3K segment from region 4
+TA1 - got segment from region 4 - 16#70#
+TA1 - region_get_segment - attempt to get 3K segment from region 4
+TA1 - task_get_note - UNSATISFIED
+TA1 - region_extend - extend region 4 by 4K
+TA1 - region_get_segment - attempt to get 3K segment from region 4
+TA1 - got 3K segment from region 4 - 16#CF0#
+TA1 - return_segment - return segment to region 4 - 16#70#
+TA1 - region_return_segment - return segment to region 4 - 16#CF0#
+TA1 - region_delete - delete region 4
*** END OF TEST 16 ***
diff --git a/c/src/ada-tests/sptests/sp16/sptest.adb b/c/src/ada-tests/sptests/sp16/sptest.adb
index 95463e01ee..0e6576ec79 100644
--- a/c/src/ada-tests/sptests/sp16/sptest.adb
+++ b/c/src/ada-tests/sptests/sp16/sptest.adb
@@ -106,8 +106,9 @@ package body SPTEST is
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA3" );
SPTEST.REGION_NAME( 1 ) := RTEMS.BUILD_NAME( 'R', 'N', '1', ' ' );
- SPTEST.REGION_NAME( 2 ) := RTEMS.BUILD_NAME( 'R', 'N', '1', ' ' );
- SPTEST.REGION_NAME( 3 ) := RTEMS.BUILD_NAME( 'R', 'N', '1', ' ' );
+ SPTEST.REGION_NAME( 2 ) := RTEMS.BUILD_NAME( 'R', 'N', '2', ' ' );
+ SPTEST.REGION_NAME( 3 ) := RTEMS.BUILD_NAME( 'R', 'N', '3', ' ' );
+ SPTEST.REGION_NAME( 4 ) := RTEMS.BUILD_NAME( 'R', 'N', '4', ' ' );
RTEMS.REGION_CREATE(
SPTEST.REGION_NAME( 1 ),
@@ -142,7 +143,17 @@ package body SPTEST is
);
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_CREATE OF RN3" );
-
+ RTEMS.REGION_CREATE(
+ SPTEST.REGION_NAME( 4 ),
+ SPTEST.AREA_4'ADDRESS,
+ 4096,
+ 128,
+ RTEMS.DEFAULT_ATTRIBUTES,
+ SPTEST.REGION_ID( 4 ),
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_CREATE OF RN4" );
+
RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
@@ -205,6 +216,24 @@ package body SPTEST is
--PAGE
--
+-- PUT_ADDRESS_FROM_AREA_4
+--
+
+ procedure PUT_ADDRESS_FROM_AREA_4 (
+ TO_BE_PRINTED : in RTEMS.ADDRESS
+ ) is
+ begin
+
+ UNSIGNED32_IO.PUT(
+ RTEMS.SUBTRACT( TO_BE_PRINTED, SPTEST.AREA_4'ADDRESS ),
+ WIDTH => 8,
+ BASE => 16
+ );
+
+ end PUT_ADDRESS_FROM_AREA_4;
+
+--PAGE
+--
-- TASK_1
--
@@ -398,7 +427,7 @@ TEST_SUPPORT.PAUSE;
SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_4 );
TEXT_IO.NEW_LINE;
- TEXT_IO.PUT_LINE( "TA1 - task_wake_after - sleep 1 second" );
+ TEXT_IO.PUT_LINE( "TA1 - task_wake_after - yield processor" );
RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
@@ -425,6 +454,85 @@ TEST_SUPPORT.PAUSE;
TEXT_IO.PUT_LINE( "TA1 - region_delete - delete region 1" );
RTEMS.REGION_DELETE( SPTEST.REGION_ID( 1 ), STATUS );
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_DELETE OF RN1" );
+--XXX
+ TEXT_IO.PUT_LINE(
+ "TA1 - region_get_segment - get 3K segment from region 4"
+ );
+ RTEMS.REGION_GET_SEGMENT(
+ SPTEST.REGION_ID( 4 ),
+ 3072,
+ RTEMS.DEFAULT_OPTIONS,
+ RTEMS.NO_TIMEOUT,
+ segment_address_1,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "region_get_segment" );
+ TEXT_IO.PUT( "TA1 - got segment from region 4 - " );
+ PUT_ADDRESS_FROM_AREA_4( segment_address_1 );
+ TEXT_IO.NEW_LINE;
+
+ TEXT_IO.PUT_LINE(
+ "TA1 - region_get_segment - attempt to get 3K segment from region 4"
+ );
+ RTEMS.REGION_GET_SEGMENT(
+ SPTEST.REGION_ID( 4 ),
+ 3072,
+ RTEMS.NO_WAIT,
+ RTEMS.NO_TIMEOUT,
+ SEGMENT_ADDRESS_2,
+ STATUS
+ );
+ TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
+ STATUS,
+ RTEMS.UNSATISFIED,
+ "task_get_segment with no memory left"
+ );
+ TEXT_IO.PUT_LINE( "TA1 - task_get_note - UNSATISFIED" );
+
+ TEXT_IO.PUT_LINE( "TA1 - region_extend - extend region 4 by 4K" );
+ RTEMS.REGION_EXTEND(
+ SPTEST.REGION_ID( 4 ),
+ SPTEST.AREA_4( 4096 )'ADDRESS,
+ 4096,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( status, "region_extend" );
+
+ TEXT_IO.PUT_LINE(
+ "TA1 - region_get_segment - attempt to get 3K segment from region 4"
+ );
+ RTEMS.REGION_GET_SEGMENT(
+ SPTEST.REGION_ID( 4 ),
+ 3072,
+ RTEMS.NO_WAIT,
+ RTEMS.NO_TIMEOUT,
+ segment_address_3,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( status, "region_get_segment" );
+ TEXT_IO.PUT( "TA1 - got 3K segment from region 4 - " );
+ PUT_ADDRESS_FROM_AREA_4( segment_address_3 );
+ TEXT_IO.NEW_LINE;
+
+ TEXT_IO.PUT(
+ "TA1 - return_segment - return segment to region 4 - "
+ );
+ PUT_ADDRESS_FROM_AREA_4( segment_address_1 );
+ RTEMS.REGION_RETURN_SEGMENT( SPTEST.REGION_ID( 4 ), segment_address_1, STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED( status, "region_return_segment" );
+ TEXT_IO.NEW_LINE;
+
+ TEXT_IO.PUT(
+ "TA1 - region_return_segment - return segment to region 4 - "
+ );
+ PUT_ADDRESS_FROM_AREA_4( segment_address_3 );
+ RTEMS.REGION_RETURN_SEGMENT( SPTEST.REGION_ID( 4 ), segment_address_3, STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED( status, "region_return_segment" );
+ TEXT_IO.NEW_LINE;
+
+ TEXT_IO.PUT_LINE( "TA1 - region_delete - delete region 4" );
+ RTEMS.REGION_DELETE( SPTEST.REGION_ID( 4 ), STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED( status, "region_delete" );
TEXT_IO.PUT_LINE( "*** END OF TEST 16 ***" );
RTEMS.SHUTDOWN_EXECUTIVE( 0 );
diff --git a/c/src/ada-tests/sptests/sp16/sptest.ads b/c/src/ada-tests/sptests/sp16/sptest.ads
index 5ef71d9919..a2ea517801 100644
--- a/c/src/ada-tests/sptests/sp16/sptest.ads
+++ b/c/src/ada-tests/sptests/sp16/sptest.ads
@@ -37,8 +37,8 @@ package SPTEST is
-- by this test.
--
- REGION_ID : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
- REGION_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
+ REGION_ID : array ( RTEMS.UNSIGNED32 range 1 .. 4 ) of RTEMS.ID;
+ REGION_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 4 ) of RTEMS.NAME;
--
-- The following constant defines the priority of most of the
@@ -62,6 +62,9 @@ package SPTEST is
AREA_3 : array ( RTEMS.UNSIGNED32 range 0 .. 4095 ) of RTEMS.UNSIGNED8;
for AREA_3'ALIGNMENT use RTEMS.STRUCTURE_ALIGNMENT;
+ AREA_4 : array ( RTEMS.UNSIGNED32 range 0 .. 8191 ) of RTEMS.UNSIGNED8;
+ for AREA_4'ALIGNMENT use RTEMS.STRUCTURE_ALIGNMENT;
+
--
-- INIT
--