Changeset d138a790 in rtems

Timestamp:

Feb 24, 2021, 12:12:27 PM (8 weeks ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

master

Children:

d8bfa5a

Parents:

32b0d6f8

git-author:

Sebastian Huber <sebastian.huber@…> (02/24/21 12:12:27)

git-committer:

Sebastian Huber <sebastian.huber@…> (02/24/21 12:32:35)

Message:

config: Adjust stack allocator initialization

Use the right system initialization step for the stack allocator
initialization. Do the stack allocator initialization before the
workspace initialization so that _Memory_Allocate() can be used to get
memory for the allocator.

Location:

cpukit

Files:

• include/rtems/confdefs/wkspace.h (modified) (1 diff)
• include/rtems/sysinit.h (modified) (2 diffs)
• sapi/src/sysinitverbose.c (modified) (2 diffs)

cpukit/include/rtems/confdefs/wkspace.h

@@ -168 +168 @@
     RTEMS_SYSINIT_ITEM(
       _Stack_Allocator_do_initialize,
-      RTEMS_SYSINIT_DIRTY_MEMORY,
+      RTEMS_SYSINIT_STACK_ALLOCATOR,
       RTEMS_SYSINIT_ORDER_MIDDLE
     );

cpukit/include/rtems/sysinit.h

@@ -35 +35 @@
 #define RTEMS_SYSINIT_PER_CPU_DATA               000220
 #define RTEMS_SYSINIT_SBRK                       000240
+#define RTEMS_SYSINIT_STACK_ALLOCATOR            000250
 #define RTEMS_SYSINIT_WORKSPACE                  000260
 #define RTEMS_SYSINIT_MALLOC                     000280
@@ -42 +43 @@
 #define RTEMS_SYSINIT_MP_EARLY                   000600
 #define RTEMS_SYSINIT_DATA_STRUCTURES            000700
-#define RTEMS_SYSINIT_STACK_ALLOCATOR            000780
 #define RTEMS_SYSINIT_MP                         000800
 #define RTEMS_SYSINIT_USER_EXTENSIONS            000900

cpukit/sapi/src/sysinitverbose.c

@@ -62 +62 @@
 SYSINIT_VERBOSE( PER_CPU_DATA );
 SYSINIT_VERBOSE( SBRK );
+SYSINIT_VERBOSE( STACK_ALLOCATOR );
 SYSINIT_VERBOSE( WORKSPACE );
 SYSINIT_VERBOSE( MALLOC );
@@ -234 +235 @@
 }
 
+static void _Sysinit_Verbose_STACK_ALLOCATOR( void )
+{
+  if ( !SYSINIT_IS_ADJACENT( SBRK, STACK_ALLOCATOR ) ) {
+    _Sysinit_Print_free_memory();
+    printk( "sysinit: STACK_ALLOCATOR: done\n" );
+  }
+}
+
 static void _Sysinit_Verbose_WORKSPACE( void )
 {
-  if ( !SYSINIT_IS_ADJACENT( SBRK, WORKSPACE ) ) {
+  if ( !SYSINIT_IS_ADJACENT( STACK_ALLOCATOR, WORKSPACE ) ) {
     _Sysinit_Print_free_memory();
     printk( "sysinit: WORKSPACE: done\n" );