Changeset a00dff42 in rtems

Timestamp:

Dec 12, 2019, 5:37:01 AM (4 months ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

master

Children:

24f8915

Parents:

d24b301

git-author:

Sebastian Huber <sebastian.huber@…> (12/12/19 05:37:01)

git-committer:

Sebastian Huber <sebastian.huber@…> (12/13/19 07:22:58)

Message:

rtems: Add and use rtems_object_get_local_node()

Update #3841.

Files:

• bsps/include/shm_driver.h (modified) (1 diff)
• bsps/shared/shmdr/shmdr-dump.c (modified) (1 diff)
• bsps/shared/shmdr/shmdr-init.c (modified) (1 diff)
• bsps/shared/shmdr/shmdr-send.c (modified) (1 diff)
• cpukit/include/rtems/rtems/object.h (modified) (1 diff)
• cpukit/include/rtems/score/object.h (modified) (1 diff)
• cpukit/include/rtems/score/objectimpl.h (modified) (1 diff)
• cpukit/libcsupport/src/error.c (modified) (1 diff)
• cpukit/libcsupport/src/getpgrp.c (modified) (2 diffs)
• cpukit/libcsupport/src/getpid.c (modified) (2 diffs)
• cpukit/libcsupport/src/utsname.c (modified) (2 diffs)
• testsuites/ada/support/initimpl.h (modified) (1 diff)
• testsuites/mptests/mp01/initimpl.h (modified) (1 diff)
• testsuites/mptests/mp03/initimpl.h (modified) (2 diffs)
• testsuites/mptests/mp03/task1.c (modified) (3 diffs)
• testsuites/mptests/mp04/initimpl.h (modified) (2 diffs)
• testsuites/mptests/mp04/task1.c (modified) (3 diffs)
• testsuites/mptests/mp05/initimpl.h (modified) (2 diffs)
• testsuites/mptests/mp05/task1.c (modified) (2 diffs)
• testsuites/mptests/mp06/initimpl.h (modified) (2 diffs)
• testsuites/mptests/mp06/task1.c (modified) (5 diffs)
• testsuites/mptests/mp07/initimpl.h (modified) (2 diffs)
• testsuites/mptests/mp07/task1.c (modified) (2 diffs)
• testsuites/mptests/mp08/initimpl.h (modified) (3 diffs)
• testsuites/mptests/mp08/task1.c (modified) (2 diffs)
• testsuites/mptests/mp09/initimpl.h (modified) (3 diffs)
• testsuites/mptests/mp09/task1.c (modified) (1 diff)
• testsuites/mptests/mp10/initimpl.h (modified) (2 diffs)
• testsuites/mptests/mp11/initimpl.h (modified) (2 diffs)
• testsuites/mptests/mp12/initimpl.h (modified) (2 diffs)
• testsuites/mptests/mp13/initimpl.h (modified) (3 diffs)
• testsuites/mptests/mp13/task1.c (modified) (1 diff)
• testsuites/mptests/mp13/task2.c (modified) (1 diff)
• testsuites/mptests/mp14/evtask1.c (modified) (3 diffs)
• testsuites/mptests/mp14/initimpl.h (modified) (6 diffs)
• testsuites/mptests/mp14/msgtask1.c (modified) (2 diffs)
• testsuites/mptests/mp14/pttask1.c (modified) (2 diffs)
• testsuites/mptests/mp14/smtask1.c (modified) (2 diffs)
• testsuites/mptests/mp14/system.h (modified) (1 diff)
• testsuites/samples/base_mp/initimpl.h (modified) (1 diff)

bsps/include/shm_driver.h

@@ -240 +240 @@
 
 #define Shm_Is_master_node()  \
-  ( SHM_MASTER ==_Configuration_MP_table-> node )
+  ( SHM_MASTER == rtems_object_get_local_node() )
 
 #define Shm_Free_envelope( ecb ) \

bsps/shared/shmdr/shmdr-dump.c

@@ -42 +42 @@
 
   printk( "\n\nSHMDR STATISTICS (NODE %" PRId32 ")\n",
-    Multiprocessing_configuration.node );
+    rtems_object_get_local_node() );
   printk( "TICKS SINCE BOOT = %" PRId32 "\n", ticks );
   printk( "TICKS PER SECOND = %" PRId32 "\n", ticks_per_second );

bsps/shared/shmdr/shmdr-init.c

@@ -47 +47 @@
   uint32_t                 local_node;
 
-  local_node = _Configuration_MP_table->node;
+  local_node = rtems_object_get_local_node();
 
   Shm_Get_configuration( local_node, &Shm_Configuration );

bsps/shared/shmdr/shmdr-send.c

@@ -47 +47 @@
   else {
     for( nnum = SHM_FIRST_NODE ; nnum <= SHM_MAXIMUM_NODES ; nnum++ )
-      if ( _Configuration_MP_table->node != nnum ) {
+      if ( rtems_object_get_local_node() != nnum ) {
         struct pkt_cpy *pkt;
 

cpukit/include/rtems/rtems/object.h

@@ -358 +358 @@
 );
 
+/**
+ * @brief Get the local MPCI node number.
+ *
+ * @return The local MPCI node number.
+ */
+RTEMS_INLINE_ROUTINE uint16_t rtems_object_get_local_node( void )
+{
+  return _Objects_Local_node;
+}
+
 #ifdef __cplusplus
 }

cpukit/include/rtems/score/object.h

@@ -339 +339 @@
   ((Objects_Maximum) ((maximum) & ~OBJECTS_UNLIMITED_OBJECTS))
 
+/**
+ * @brief The local MPCI node number.
+ */
+#if defined(RTEMS_MULTIPROCESSING)
+extern uint16_t _Objects_Local_node;
+#else
+#define _Objects_Local_node ((uint16_t) 1)
+#endif
+
 /** @} */
 /** @} */

cpukit/include/rtems/score/objectimpl.h

@@ -63 +63 @@
   OBJECTS_FAKE_OBJECTS_SCHEDULERS = 1
 } Objects_Fake_objects_API;
-
-/**
- *  The following is referenced to the node number of the local node.
- */
-#if defined(RTEMS_MULTIPROCESSING)
-extern uint16_t _Objects_Local_node;
-#else
-#define _Objects_Local_node ((uint16_t)1)
-#endif
 
 /**

cpukit/libcsupport/src/error.c

@@ -52 +52 @@
   #if defined(RTEMS_MULTIPROCESSING)
     if (_System_state_Is_multiprocessing)
-      fprintf(stderr, "[%" PRIu32 "] ", _Configuration_MP_table->node);
+      fprintf(stderr, "[%" PRIu16 "] ", rtems_object_get_local_node());
   #endif
 

cpukit/libcsupport/src/getpgrp.c

@@ -4 +4 @@
 
 #include <unistd.h>
-#include <rtems/score/objectimpl.h>
+#include <rtems.h>
 
 /*
@@ -17 +17 @@
    */
 
-  return _Objects_Local_node;
+  return rtems_object_get_local_node();
 }

cpukit/libcsupport/src/getpid.c

@@ -12 +12 @@
 #include <unistd.h>
 
-#include <rtems/score/objectimpl.h>
+#include <rtems.h>
 #include <rtems/seterr.h>
 
@@ -20 +20 @@
 pid_t getpid( void )
 {
-  return _Objects_Local_node;
+  return rtems_object_get_local_node();
 }
 

cpukit/libcsupport/src/utsname.c

@@ -24 +24 @@
 #include <inttypes.h>
 
-#include <rtems/score/objectimpl.h>
+#include <rtems.h>
 #include <rtems/seterr.h>
 
@@ -48 +48 @@
   strncpy( name->sysname, "RTEMS", sizeof(name->sysname) );
 
-  snprintf( name->nodename, sizeof(name->nodename), "Node %" PRId16, _Objects_Local_node );
+  snprintf(
+    name->nodename,
+    sizeof(name->nodename),
+    "Node %" PRId16, rtems_object_get_local_node()
+  );
 
   strncpy( name->release, RTEMS_VERSION, sizeof(name->release) );

testsuites/ada/support/initimpl.h

@@ -103 +103 @@
 uint32_t get_node(void)
 {
-  /* XXX HACK -- use public API */
-  return _Objects_Local_node;
+  return rtems_object_get_local_node();
 }
 

testsuites/mptests/mp01/initimpl.h

@@ -37 +37 @@
   printf(
     "\n\n*** TEST 1 -- NODE %" PRIu32 " ***\n",
-    Multiprocessing_configuration.node
+    rtems_object_get_local_node()
   );
 
-  if ( Multiprocessing_configuration.node != 1 ) c = 'S';
+  if ( rtems_object_get_local_node() != 1 ) c = 'S';
   else                                           c = 'M';
 

testsuites/mptests/mp03/initimpl.h

@@ -35 +35 @@
   printf(
     "\n\n*** TEST 3 -- NODE %" PRIu32 " ***\n",
-    Multiprocessing_configuration.node
+    rtems_object_get_local_node()
   );
 
@@ -43 +43 @@
   puts( "Creating Test_task (Global)" );
   status = rtems_task_create(
-    Task_name[ Multiprocessing_configuration.node ],
+    Task_name[ rtems_object_get_local_node() ],
     1,
     RTEMS_MINIMUM_STACK_SIZE,

testsuites/mptests/mp03/task1.c

@@ -21 +21 @@
   rtems_status_code status;
 
-  if ( Multiprocessing_configuration.node == node ) {
+  if ( rtems_object_get_local_node() == node ) {
 
     for ( ; ; ) {
@@ -99 +99 @@
 
   puts( "Getting TID of remote task" );
-  remote_node = (Multiprocessing_configuration.node == 1) ? 2 : 1;
+  remote_node = (rtems_object_get_local_node() == 1) ? 2 : 1;
   printf( "Remote task's name is : " );
   put_name( Task_name[ remote_node ], TRUE );
@@ -131 +131 @@
   directive_failed( status, "rtems_timer_fire_after" );
 
-  if ( Multiprocessing_configuration.node == 1 ) {
+  if ( rtems_object_get_local_node() == 1 ) {
     status = rtems_task_wake_after( 2 * rtems_clock_get_ticks_per_second() );
     directive_failed( status, "rtems_task_wake_after" );

testsuites/mptests/mp04/initimpl.h

@@ -35 +35 @@
   printf(
     "\n\n*** TEST 4 -- NODE %" PRId32 " ***\n",
-    Multiprocessing_configuration.node
+    rtems_object_get_local_node()
   );
 
@@ -43 +43 @@
   puts( "Creating Test_task (Global)" );
   status = rtems_task_create(
-    Task_name[ Multiprocessing_configuration.node ],
-    Multiprocessing_configuration.node,
+    Task_name[ rtems_object_get_local_node() ],
+    rtems_object_get_local_node(),
     RTEMS_MINIMUM_STACK_SIZE,
     RTEMS_DEFAULT_MODES,

testsuites/mptests/mp04/task1.c

@@ -23 +23 @@
 #include "tmacros.h"
 
-extern rtems_multiprocessing_table Multiprocessing_configuration;
-
 rtems_task Test_task(
   rtems_task_argument argument
@@ -40 +38 @@
 
   puts( "Getting TID of remote task" );
-  remote_node = (Multiprocessing_configuration.node == 1) ? 2 : 1;
+  remote_node = (rtems_object_get_local_node() == 1) ? 2 : 1;
   puts_nocr( "Remote task's name is : " );
   put_name( Task_name[ remote_node ], TRUE );
@@ -56 +54 @@
   status = rtems_task_set_priority(
     remote_tid,
-    Multiprocessing_configuration.node,
+    rtems_object_get_local_node(),
     &previous_priority
   );

testsuites/mptests/mp05/initimpl.h

@@ -35 +35 @@
   printf(
     "\n\n*** TEST 5 -- NODE %" PRIu32 " ***\n",
-    Multiprocessing_configuration.node
+    rtems_object_get_local_node()
   );
 
@@ -43 +43 @@
   puts( "Creating Test_task (Global)" );
   status = rtems_task_create(
-    Task_name[Multiprocessing_configuration.node],
+    Task_name[rtems_object_get_local_node()],
     1,
     RTEMS_MINIMUM_STACK_SIZE * 2,

testsuites/mptests/mp05/task1.c

@@ -51 +51 @@
   directive_failed( status, "rtems_signal_catch" );
 
-  if (Multiprocessing_configuration.node == 1) {
+  if (rtems_object_get_local_node() == 1) {
      remote_node = 2;
      remote_signal  = RTEMS_SIGNAL_18;
@@ -82 +82 @@
   directive_failed( status, "rtems_timer_fire_after" );
 
-  if ( Multiprocessing_configuration.node == 1 ) {
+  if ( rtems_object_get_local_node() == 1 ) {
     puts( "Sending signal to remote task" );
     do {

testsuites/mptests/mp06/initimpl.h

@@ -35 +35 @@
   printf(
     "\n\n*** TEST 6 -- NODE %" PRId32 " ***\n",
-    Multiprocessing_configuration.node
+    rtems_object_get_local_node()
   );
 
@@ -43 +43 @@
   puts( "Creating Test_task (Global)" );
   status = rtems_task_create(
-    Task_name[Multiprocessing_configuration.node],
+    Task_name[rtems_object_get_local_node()],
     1,
     RTEMS_MINIMUM_STACK_SIZE,

testsuites/mptests/mp06/task1.c

@@ -81 +81 @@
   Stop_Test = false;
 
-  remote_node = (Multiprocessing_configuration.node == 1) ? 2 : 1;
+  remote_node = (rtems_object_get_local_node() == 1) ? 2 : 1;
   puts_nocr( "Remote task's name is : " );
   put_name( Task_name[ remote_node ], TRUE );
@@ -95 +95 @@
   directive_failed( status, "rtems_task_ident FAILED!!" );
 
-  if ( Multiprocessing_configuration.node == 1 )
+  if ( rtems_object_get_local_node() == 1 )
     puts( "Sending events to remote task" );
   else
@@ -116 +116 @@
     event_for_this_iteration = Event_set_table[ count % 32 ];
 
-    if ( Multiprocessing_configuration.node == 1 ) {
+    if ( rtems_object_get_local_node() == 1 ) {
       status = rtems_event_send( remote_tid, event_for_this_iteration );
       directive_failed( status, "rtems_event_send" );
@@ -130 +130 @@
       );
       if ( rtems_are_statuses_equal( status, RTEMS_TIMEOUT ) ) {
-        if ( Multiprocessing_configuration.node == 2 )
+        if ( rtems_object_get_local_node() == 2 )
           puts( "\nCorrect behavior if the other node exitted." );
         else
@@ -147 +147 @@
   putchar( '\n' );
 
-  if ( Multiprocessing_configuration.node == 2 ) {
+  if ( rtems_object_get_local_node() == 2 ) {
     /* Flush events */
     puts( "Flushing RTEMS_EVENT_16" );

testsuites/mptests/mp07/initimpl.h

@@ -35 +35 @@
   printf(
    "\n\n*** TEST 7 -- NODE %" PRId32 " ***\n",
-   Multiprocessing_configuration.node
+   rtems_object_get_local_node()
   );
 
@@ -43 +43 @@
   puts( "Creating Test_task (Global)" );
   status = rtems_task_create(
-    Task_name[Multiprocessing_configuration.node],
+    Task_name[rtems_object_get_local_node()],
     1,
     RTEMS_MINIMUM_STACK_SIZE,

testsuites/mptests/mp07/task1.c

@@ -46 +46 @@
   Stop_Test = false;
 
-  remote_node = (Multiprocessing_configuration.node == 1) ? 2 : 1;
+  remote_node = (rtems_object_get_local_node() == 1) ? 2 : 1;
   puts_nocr( "Remote task's name is : " );
   put_name( Task_name[ remote_node ], TRUE );
@@ -59 +59 @@
   } while ( !rtems_is_status_successful( status ) );
 
-  if ( Multiprocessing_configuration.node == 1 ) {
+  if ( rtems_object_get_local_node() == 1 ) {
     puts( "Sending first event to remote task" );
     status = rtems_event_send( remote_tid, RTEMS_EVENT_16 );

testsuites/mptests/mp08/initimpl.h

@@ -35 +35 @@
   printf(
     "\n\n*** TEST 8 -- NODE %" PRIu32 " ***\n",
-    Multiprocessing_configuration.node
+    rtems_object_get_local_node()
   );
 
@@ -43 +43 @@
   Semaphore_name[ 1 ] = rtems_build_name( 'S', 'E', 'M', '\0' );
 
-  if ( Multiprocessing_configuration.node == 1 ) {
+  if ( rtems_object_get_local_node() == 1 ) {
     puts( "Creating Sempahore (Global)" );
     status = rtems_semaphore_create(
@@ -57 +57 @@
   puts( "Creating Test_task (Global)" );
   status = rtems_task_create(
-    Task_name[ Multiprocessing_configuration.node ],
+    Task_name[ rtems_object_get_local_node() ],
     1,
     RTEMS_MINIMUM_STACK_SIZE,

testsuites/mptests/mp08/task1.c

@@ -40 +40 @@
   } while ( !rtems_is_status_successful( status ) );
 
-  if ( Multiprocessing_configuration.node == 2 ) {
+  if ( rtems_object_get_local_node() == 2 ) {
     status = rtems_semaphore_delete( Semaphore_id[ 1 ] );
     fatal_directive_status(
@@ -71 +71 @@
     }
 
-    if ( Multiprocessing_configuration.node == 1 && ++count == 1000 ) {
+    if ( rtems_object_get_local_node() == 1 && ++count == 1000 ) {
       status = rtems_task_wake_after( rtems_clock_get_ticks_per_second() );
       directive_failed( status, "rtems_task_wake_after" );

testsuites/mptests/mp09/initimpl.h

@@ -35 +35 @@
   printf(
     "\n\n*** TEST 9 -- NODE %" PRId32 " ***\n",
-    Multiprocessing_configuration.node
+    rtems_object_get_local_node()
   );
 
@@ -43 +43 @@
   Queue_name[ 1 ] = rtems_build_name( 'M', 'S', 'G', ' ' );
 
-  if ( Multiprocessing_configuration.node == 1 ) {
+  if ( rtems_object_get_local_node() == 1 ) {
     puts( "Creating Message Queue (Global)" );
     status = rtems_message_queue_create(
@@ -57 +57 @@
   puts( "Creating Test_task (local)" );
   status = rtems_task_create(
-    Task_name[Multiprocessing_configuration.node],
+    Task_name[rtems_object_get_local_node()],
     1,
     RTEMS_MINIMUM_STACK_SIZE,

testsuites/mptests/mp09/task1.c

@@ -50 +50 @@
   } while ( !rtems_is_status_successful( status ) );
 
-  if ( Multiprocessing_configuration.node == 2 ) {
+  if ( rtems_object_get_local_node() == 2 ) {
     status = rtems_message_queue_delete( Queue_id[ 1 ] );
     fatal_directive_status(

testsuites/mptests/mp10/initimpl.h

@@ -41 +41 @@
   printf(
    "\n\n*** TEST 10 -- NODE %" PRIu32 " ***\n",
-   Multiprocessing_configuration.node
+   rtems_object_get_local_node()
   );
 
@@ -52 +52 @@
   Semaphore_name[ 1 ] = rtems_build_name( 'S', 'E', 'M', ' ' );
 
-  if ( Multiprocessing_configuration.node == 1 ) {
+  if ( rtems_object_get_local_node() == 1 ) {
     puts( "Creating Message Queue (Global)" );
     status = rtems_message_queue_create(

testsuites/mptests/mp11/initimpl.h

@@ -41 +41 @@
   printf(
     "\n\n*** TEST 11 -- NODE %" PRIu32 " ***\n",
-    Multiprocessing_configuration.node
+    rtems_object_get_local_node()
   );
 
@@ -51 +51 @@
   Semaphore_name[ 1 ] = rtems_build_name( 'S', 'E', 'M', ' ' );
 
-  if ( Multiprocessing_configuration.node == 1 ) {
+  if ( rtems_object_get_local_node() == 1 ) {
     puts( "Attempting to create Test_task (Global)" );
     status = rtems_task_create(

testsuites/mptests/mp12/initimpl.h

@@ -43 +43 @@
   printf(
     "\n\n*** TEST 12 -- NODE %" PRId32 " ***\n",
-    Multiprocessing_configuration.node
+    rtems_object_get_local_node()
    );
 
@@ -53 +53 @@
   puts( "Got to initialization task" );
 
-  if ( Multiprocessing_configuration.node == 2 )  {
+  if ( rtems_object_get_local_node() == 2 )  {
     status = rtems_task_wake_after( rtems_clock_get_ticks_per_second() );
     directive_failed( status, "rtems_task_wake_after" );

testsuites/mptests/mp13/initimpl.h

@@ -35 +35 @@
   printf(
     "\n\n*** TEST 13 -- NODE %" PRId32 " ***\n",
-    Multiprocessing_configuration.node
+    rtems_object_get_local_node()
   );
 
@@ -45 +45 @@
   Semaphore_name[ 1 ] = rtems_build_name( 'S', 'E', 'M', ' ' );
 
-  if ( Multiprocessing_configuration.node == 1 ) {
+  if ( rtems_object_get_local_node() == 1 ) {
     puts( "Creating Message Queue (Global)" );
     status = rtems_message_queue_create(
@@ -104 +104 @@
   directive_failed( status, "rtems_task_start" );
 
-  if ( Multiprocessing_configuration.node == 1 ) {
+  if ( rtems_object_get_local_node() == 1 ) {
     status = rtems_task_wake_after( 5 * rtems_clock_get_ticks_per_second() );
     directive_failed( status, "rtems_task_wake_after" );

testsuites/mptests/mp13/task1.c

@@ -42 +42 @@
   } while ( !rtems_is_status_successful( status ) );
 
-  if ( Multiprocessing_configuration.node == 1 ) {
+  if ( rtems_object_get_local_node() == 1 ) {
     puts( "Receiving message ..." );
     status = rtems_message_queue_receive(

testsuites/mptests/mp13/task2.c

@@ -41 +41 @@
   directive_failed( status, "rtems_semaphore_ident" );
 
-  if ( Multiprocessing_configuration.node == 1 ) {
+  if ( rtems_object_get_local_node() == 1 ) {
     status = rtems_task_wake_after( rtems_clock_get_ticks_per_second() );
     directive_failed( status, "rtems_task_wake_after" );

testsuites/mptests/mp14/evtask1.c

@@ -24 +24 @@
 #include "system.h"
 
-extern rtems_multiprocessing_table Multiprocessing_configuration;
-
 rtems_task Test_task(
   rtems_task_argument argument
@@ -36 +34 @@
   rtems_event_set   event_out;
 
-  remote_node = ((Multiprocessing_configuration.node == 1) ? 2 : 1);
+  remote_node = ((rtems_object_get_local_node() == 1) ? 2 : 1);
 
   puts( "About to go to sleep!" );
@@ -60 +58 @@
   }
 
-  if ( Multiprocessing_configuration.node == 1 ) {
+  if ( rtems_object_get_local_node() == 1 ) {
     puts( "Sending events to remote task" );
     while ( Stop_Test == false ) {

testsuites/mptests/mp14/initimpl.h

@@ -52 +52 @@
   printf(
     "\n\n*** TEST 14 -- NODE %" PRId32 " ***\n",
-    Multiprocessing_configuration.node
+    rtems_object_get_local_node()
   );
 
@@ -91 +91 @@
   Timer_name[ 1 ] = rtems_build_name( 'T', 'M', 'R', ' ' );
 
-  if ( Multiprocessing_configuration.node == 1 ) {
+  if ( rtems_object_get_local_node() == 1 ) {
     puts( "Creating Semaphore (Global)" );
     status = rtems_semaphore_create(
@@ -126 +126 @@
   puts( "Creating Event task (Global)" );
   status = rtems_task_create(
-    Task_name[ Multiprocessing_configuration.node ],
+    Task_name[ rtems_object_get_local_node() ],
     2,
     RTEMS_MINIMUM_STACK_SIZE,
@@ -141 +141 @@
   puts( "Creating Semaphore task (Global)" );
   status = rtems_task_create(
-    Semaphore_task_name[ Multiprocessing_configuration.node ],
+    Semaphore_task_name[ rtems_object_get_local_node() ],
     2,
     RTEMS_MINIMUM_STACK_SIZE,
@@ -156 +156 @@
   puts( "Creating Message Queue task (Global)" );
   status = rtems_task_create(
-    Queue_task_name[ Multiprocessing_configuration.node ],
+    Queue_task_name[ rtems_object_get_local_node() ],
     2,
     RTEMS_MINIMUM_STACK_SIZE,
@@ -172 +172 @@
   puts( "Creating Partition task (Global)" );
   status = rtems_task_create(
-    Partition_task_name[ Multiprocessing_configuration.node ],
+    Partition_task_name[ rtems_object_get_local_node() ],
     2,
     RTEMS_MINIMUM_STACK_SIZE * 2,

testsuites/mptests/mp14/msgtask1.c

@@ -54 +54 @@
   }
 
-  if ( Multiprocessing_configuration.node == 1 ) {
+  if ( rtems_object_get_local_node() == 1 ) {
       status = rtems_message_queue_send(
         Queue_id[ 1 ],
@@ -95 +95 @@
 
       if (Stop_Test == false)
-        if ( Multiprocessing_configuration.node == 1 && --yield_count == 0 ) {
+        if ( rtems_object_get_local_node() == 1 && --yield_count == 0 ) {
           status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
           directive_failed( status, "rtems_task_wake_after" );

testsuites/mptests/mp14/pttask1.c

@@ -22 +22 @@
 
 #include "system.h"
-
-extern rtems_multiprocessing_table Multiprocessing_configuration;
 
 rtems_task Partition_task(
@@ -60 +58 @@
 
       if (Stop_Test == false)
-        if ( Multiprocessing_configuration.node == 1 && --yield_count == 0 ) {
+        if ( rtems_object_get_local_node() == 1 && --yield_count == 0 ) {
           status = rtems_task_wake_after( 1 );
           directive_failed( status, "rtems_task_wake_after" );

testsuites/mptests/mp14/smtask1.c

@@ -21 +21 @@
 
 #include "system.h"
-
-extern rtems_multiprocessing_table Multiprocessing_configuration;
 
 rtems_task Semaphore_task(
@@ -61 +59 @@
 
       if ( Stop_Test == false )
-        if ( Multiprocessing_configuration.node == 1 && --yield_count == 0 ) {
+        if ( rtems_object_get_local_node() == 1 && --yield_count == 0 ) {
           status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
           directive_failed( status, "rtems_task_wake_after" );

testsuites/mptests/mp14/system.h

@@ -105 +105 @@
 TEST_EXTERN uint32_t   Msg_buffer[ 4 ][ 4 ];
 
-extern rtems_multiprocessing_table Multiprocessing_configuration;
-
 TEST_EXTERN volatile bool Stop_Test;
 TEST_EXTERN rtems_id timer_id;

testsuites/samples/base_mp/initimpl.h

@@ -41 +41 @@
     tid,
     Application_task,
-    Multiprocessing_configuration.node
+    rtems_object_get_local_node()
   );
   rtems_test_assert(status == RTEMS_SUCCESSFUL);