RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2007-11-28 Joel Sherrill <joel.sherrill@OARcorp.com>

Browse Source 
* sapi/src/exinit.c, score/include/rtems/score/object.h,
	score/include/rtems/score/thread.h, score/src/object.c,
	score/src/thread.c: Conditionally compile out more code that is
	specific to multiprocessor configurations.
This commit is contained in:
Joel Sherrill
2007-11-28 22:04:31 +00:00
parent 12ae8a16a5
commit 922183809e
6 changed files with 65 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cpukit/ChangeLog
View File

@@ -1,3 +1,10 @@
2007-11-28 Joel Sherrill <joel.sherrill@OARcorp.com>
* sapi/src/exinit.c, score/include/rtems/score/object.h,
score/include/rtems/score/thread.h, score/src/object.c,
score/src/thread.c: Conditionally compile out more code that is
specific to multiprocessor configurations.
2007-11-28 Joel Sherrill <joel.sherrill@oarcorp.com>
* posix/Makefile.am, posix/preinstall.am, posix/src/cancel.c,

89
cpukit/sapi/src/exinit.c
View File

@@ -1,7 +1,7 @@
/*
* Initialization Manager
*
* COPYRIGHT (c) 1989-1999.
* COPYRIGHT (c) 1989-2007.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -67,16 +67,17 @@ rtems_interrupt_level rtems_initialize_executive_early(
)
{
rtems_interrupt_level bsp_level;
rtems_multiprocessing_table *multiprocessing_table;
/*
* Dispatching and interrupts are disabled until the end of the
* initialization sequence. This prevents an inadvertent context
* switch before the executive is initialized.
*/
_ISR_Disable( bsp_level );
/*
* Make sure the parameters were not NULL.
*/
if ( configuration_table == NULL )
_Internal_error_Occurred(
INTERNAL_ERROR_CORE,
@@ -84,46 +85,6 @@ rtems_interrupt_level rtems_initialize_executive_early(
INTERNAL_ERROR_NO_CONFIGURATION_TABLE
);
/*
* Initialize the system state based on whether this is an MP system.
*/
#if defined(RTEMS_MULTIPROCESSING)
multiprocessing_table = configuration_table->User_multiprocessing_table;
_System_state_Handler_initialization(
(multiprocessing_table) ? TRUE : FALSE
);
#else
multiprocessing_table = NULL;
_System_state_Handler_initialization( FALSE );
#endif
/*
* Grab our own copy of the user's CPU table.
*/
_CPU_Table = *cpu_table;
/*
* Provided just for user convenience.
*/
_Configuration_Table = configuration_table;
#if defined(RTEMS_MULTIPROCESSING)
_Configuration_MP_table = multiprocessing_table;
#endif
/*
* Internally we view single processor systems as a very restricted
* multiprocessor system.
*/
if ( multiprocessing_table == NULL )
multiprocessing_table =
(void *)&_Initialization_Default_multiprocessing_table;
if ( cpu_table == NULL )
_Internal_error_Occurred(
INTERNAL_ERROR_CORE,
@@ -131,6 +92,35 @@ rtems_interrupt_level rtems_initialize_executive_early(
INTERNAL_ERROR_NO_CPU_TABLE
);
#if defined(RTEMS_MULTIPROCESSING)
/*
* Initialize the system state based on whether this is an MP system.
* In an MP configuration, internally we view single processor
* systems as a very restricted multiprocessor system.
*/
_Configuration_MP_table = configuration_table->User_multiprocessing_table;
if ( _Configuration_MP_table == NULL ) {
_Configuration_MP_table =
(void *)&_Initialization_Default_multiprocessing_table;
_System_state_Handler_initialization( FALSE );
} else {
_System_state_Handler_initialization( TRUE );
}
#else
_System_state_Handler_initialization( FALSE );
#endif
/*
* Grab our own copy of the user's CPU table.
*/
_CPU_Table = *cpu_table;
/*
* Provide pointers just for later convenience.
*/
_Configuration_Table = configuration_table;
_CPU_Initialize( cpu_table, _Thread_Dispatch );
/*
@@ -157,9 +147,11 @@ rtems_interrupt_level rtems_initialize_executive_early(
_ISR_Handler_initialization();
_Objects_Handler_initialization(
multiprocessing_table->node,
multiprocessing_table->maximum_nodes,
multiprocessing_table->maximum_global_objects
#if defined(RTEMS_MULTIPROCESSING)
_Configuration_MP_table->node,
_Configuration_MP_table->maximum_nodes,
_Configuration_MP_table->maximum_global_objects
#endif
);
_Objects_Information_table[OBJECTS_INTERNAL_API] = _Internal_Objects;
@@ -178,8 +170,11 @@ rtems_interrupt_level rtems_initialize_executive_early(
_Thread_Handler_initialization(
configuration_table->ticks_per_timeslice,
configuration_table->maximum_extensions,
configuration_table->maximum_extensions
#if defined(RTEMS_MULTIPROCESSING)
,
multiprocessing_table->maximum_proxies
#endif
);
#if defined(RTEMS_MULTIPROCESSING)

2
cpukit/score/include/rtems/score/object.h
View File

@@ -435,9 +435,11 @@ SCORE_EXTERN Objects_Information
* concurrently offered in the system.
*/
void _Objects_Handler_initialization(
#if defined(RTEMS_MULTIPROCESSING)
uint32_t node,
uint32_t maximum_nodes,
uint32_t maximum_global_objects
#endif
);
/**

7
cpukit/score/include/rtems/score/thread.h
View File

@@ -6,7 +6,7 @@
*/
/*
* COPYRIGHT (c) 1989-2006.
* COPYRIGHT (c) 1989-2007.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -473,8 +473,11 @@ SCORE_EXTERN struct _reent **_Thread_libc_reent;
*/
void _Thread_Handler_initialization (
uint32_t ticks_per_timeslice,
uint32_t maximum_extensions,
uint32_t maximum_extensions
#if defined(RTEMS_MULTIPROCESSING)
,
uint32_t maximum_proxies
#endif
);
/**

6
cpukit/score/src/object.c
View File

@@ -2,7 +2,7 @@
* Object Handler
*
*
* COPYRIGHT (c) 1989-1999.
* COPYRIGHT (c) 1989-2007.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -43,11 +43,14 @@
*/
void _Objects_Handler_initialization(
#if defined(RTEMS_MULTIPROCESSING)
uint32_t node,
uint32_t maximum_nodes,
uint32_t maximum_global_objects
#endif
)
{
#if defined(RTEMS_MULTIPROCESSING)
if ( node < 1 || node > maximum_nodes )
_Internal_error_Occurred(
INTERNAL_ERROR_CORE,
@@ -55,7 +58,6 @@ void _Objects_Handler_initialization(
INTERNAL_ERROR_INVALID_NODE
);
#if defined(RTEMS_MULTIPROCESSING)
_Objects_Local_node = node;
_Objects_Maximum_nodes = maximum_nodes;

7
cpukit/score/src/thread.c
View File

@@ -2,7 +2,7 @@
* Thread Handler
*
*
* COPYRIGHT (c) 1989-1999.
* COPYRIGHT (c) 1989-2007.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -45,8 +45,11 @@
void _Thread_Handler_initialization(
uint32_t ticks_per_timeslice,
uint32_t maximum_extensions,
uint32_t maximum_extensions
#if defined(RTEMS_MULTIPROCESSING)
,
uint32_t maximum_proxies
#endif
)
{
uint32_t index;