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

2001-04-08 Joel Sherrill <joel@OARcorp.com>

Browse Source 
* macros/rtems/score/userext.inl: Updated to reflect modifications
	to inline version from PR142.
	* inline/rtems/score/userext.inl: Cleanup as side-effect of above.
This commit is contained in:
Joel Sherrill
2002-04-08 18:21:47 +00:00
parent e2c488a484
commit aadb6b0db7
6 changed files with 140 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
c/src/exec/score/ChangeLog
View File

@@ -1,3 +1,9 @@
2001-04-08 Joel Sherrill <joel@OARcorp.com>
* macros/rtems/score/userext.inl: Updated to reflect modifications
to inline version from PR142.
* inline/rtems/score/userext.inl: Cleanup as side-effect of above.
2002-04-08 Chris Johns <ccj@acm.org> 2002-04-08 Chris Johns <ccj@acm.org>
* Per PR142, make task switch extension its own list. * Per PR142, make task switch extension its own list.

12
c/src/exec/score/inline/rtems/score/userext.inl
View File

@@ -39,6 +39,7 @@ RTEMS_INLINE_ROUTINE void _User_extensions_Add_set (
/* /*
* If a switch handler is present, append it to the switch chain. * If a switch handler is present, append it to the switch chain.
*/ */
if ( extension_table->thread_switch != NULL ) { if ( extension_table->thread_switch != NULL ) {
the_extension->Switch.thread_switch = extension_table->thread_switch; the_extension->Switch.thread_switch = extension_table->thread_switch;
_Chain_Append( &_User_extensions_Switches_list, &the_extension->Switch.Node ); _Chain_Append( &_User_extensions_Switches_list, &the_extension->Switch.Node );
@@ -97,7 +98,16 @@ RTEMS_INLINE_ROUTINE void _User_extensions_Add_API_set (
User_extensions_Control *the_extension User_extensions_Control *the_extension
) )
{ {
_User_extensions_Add_set( the_extension ); _Chain_Append( &_User_extensions_List, &the_extension->Node );
/*
* If a switch handler is present, append it to the switch chain.
*/
if ( extension_table->thread_switch != NULL ) {
_Chain_Append(
&_User_extensions_Switches_list, &the_extension->Switch.Node );
}
} }
/*PAGE /*PAGE

69
c/src/exec/score/macros/rtems/score/userext.inl
View File

@@ -23,20 +23,28 @@
*/ */
#define _User_extensions_Handler_initialization( \ #define _User_extensions_Handler_initialization( \
number_of_extensions, _initial_extensions \ _number_of_extensions, _initial_extensions \
) \ ) \
{ \ { \
User_extensions_Control *extension; \ User_extensions_Control *extension; \
unsigned32 i; \ unsigned32 i; \
\
_Chain_Initialize_empty( &_User_extensions_List ); \ _Chain_Initialize_empty( &_User_extensions_List ); \
_Chain_Initialize_empty( &_User_extensions_Switches_list ); \
\ \
if ( (_initial_extensions) ) { \ if ( (_initial_extensions) ) { \
for (i=0 ; i<number_of_extensions ; i++ ) { \ extension = _Workspace_Allocate_or_fatal_error( \
extension = \ sizeof(User_extensions_Control) * _number_of_extensions ); \
_Workspace_Allocate_or_fatal_error( sizeof(User_extensions_Control) ); \ \
\ memset ( \
extension->Callouts = _initial_extensions[i]; \ extension, \
_Chain_Append( &_User_extensions_List, &extension->Node ); \ 0, \
_number_of_extensions * sizeof( User_extensions_Control ) \
); \
\
for ( i = 0 ; i < _number_of_extensions ; i++ ) { \
_User_extensions_Add_set (extension, &_initial_extensions[i]); \
extension++; \
} \ } \
} \ } \
} }
@@ -50,16 +58,33 @@
do { \ do { \
(_the_extension)->Callouts = *(_extension_table); \ (_the_extension)->Callouts = *(_extension_table); \
\ \
_Chain_Append( &_User_extensions_List, &(_the_extension)->Node ); \ _Chain_Prepend( &_User_extensions_List, &(_the_extension)->Node ); \
\
if ( (_the_extension)->Callouts.thread_switch != NULL ) { \
(_the_extension)->Switch.thread_switch = \
(_the_extension)->Callouts.thread_switch; \
_Chain_Append( \
&_User_extensions_Switches_list, \
&(_the_extension)->Switch.Node \
); \
} \
} while ( 0 ) } while ( 0 )
/*PAGE /*PAGE
* *
* _User_extensions_Add_API_set * _User_extensions_Add_API_set
*/ */
#define _User_extensions_Add_API_set( _the_extension ) \ #define _User_extensions_Add_API_set( _the_extension ) \
_Chain_Prepend( &_User_extensions_List, &(_the_extension)->Node ) do { \
_Chain_Prepend( &_User_extensions_List, &(_the_extension)->Node ); \
\
if ( (_the_extension)->Callouts.thread_switch != NULL ) { \
_Chain_Append( \
&_User_extensions_Switches_list, &(_the_extension)->Switch.Node ); \
} \
} while ( 0 )
/*PAGE /*PAGE
@@ -68,7 +93,13 @@
*/ */
#define _User_extensions_Remove_set( _the_extension ) \ #define _User_extensions_Remove_set( _the_extension ) \
_Chain_Extract( &(_the_extension)->Node ) do { \
_Chain_Extract( &(_the_extension)->Node ); \
\
if ( (_the_extension)->Callouts.thread_switch != NULL ) { \
_Chain_Extract( &(_the_extension)->Node ); \
} \
} while (0)
/*PAGE /*PAGE
* *
@@ -78,13 +109,13 @@
* messing up the name and function call expansion. * messing up the name and function call expansion.
*/ */
#define _User_extensions_Run_list_forward( _name, _arguments ) \ #define _User_extensions_Run_list_forward( _list, _name, _arguments ) \
do { \ do { \
Chain_Node *the_node; \ Chain_Node *the_node; \
User_extensions_Control *the_extension; \ User_extensions_Control *the_extension; \
\ \
for ( the_node = _User_extensions_List.first ; \ for ( the_node = (_list).first ; \
!_Chain_Is_tail( &_User_extensions_List, the_node ) ; \ !_Chain_Is_tail( &(_list), the_node ) ; \
the_node = the_node->next ) { \ the_node = the_node->next ) { \
the_extension = (User_extensions_Control *) the_node; \ the_extension = (User_extensions_Control *) the_node; \
\ \
@@ -103,13 +134,13 @@
* messing up the name and function call expansion. * messing up the name and function call expansion.
*/ */
#define _User_extensions_Run_list_backward( _name, _arguments ) \ #define _User_extensions_Run_list_backward( _list, _name, _arguments ) \
do { \ do { \
Chain_Node *the_node; \ Chain_Node *the_node; \
User_extensions_Control *the_extension; \ User_extensions_Control *the_extension; \
\ \
for ( the_node = _User_extensions_List.last ; \ for ( the_node = (_list).last ; \
!_Chain_Is_head( &_User_extensions_List, the_node ) ; \ !_Chain_Is_head( &(_list), the_node ) ; \
the_node = the_node->previous ) { \ the_node = the_node->previous ) { \
the_extension = (User_extensions_Control *) the_node; \ the_extension = (User_extensions_Control *) the_node; \
\ \
@@ -127,7 +158,11 @@
*/ */
#define _User_extensions_Thread_switch( _executing, _heir ) \ #define _User_extensions_Thread_switch( _executing, _heir ) \
_User_extensions_Run_list_forward(thread_switch, (_executing, _heir) ) _User_extensions_Run_list_forward( \
_User_extensions_Switches_list, \
thread_switch, \
(_executing, _heir) \
)
#endif #endif
/* end of include file */ /* end of include file */

6
cpukit/score/ChangeLog
View File

@@ -1,3 +1,9 @@
2001-04-08 Joel Sherrill <joel@OARcorp.com>
* macros/rtems/score/userext.inl: Updated to reflect modifications
to inline version from PR142.
* inline/rtems/score/userext.inl: Cleanup as side-effect of above.
2002-04-08 Chris Johns <ccj@acm.org> 2002-04-08 Chris Johns <ccj@acm.org>
* Per PR142, make task switch extension its own list. * Per PR142, make task switch extension its own list.

12
cpukit/score/inline/rtems/score/userext.inl
View File

@@ -39,6 +39,7 @@ RTEMS_INLINE_ROUTINE void _User_extensions_Add_set (
/* /*
* If a switch handler is present, append it to the switch chain. * If a switch handler is present, append it to the switch chain.
*/ */
if ( extension_table->thread_switch != NULL ) { if ( extension_table->thread_switch != NULL ) {
the_extension->Switch.thread_switch = extension_table->thread_switch; the_extension->Switch.thread_switch = extension_table->thread_switch;
_Chain_Append( &_User_extensions_Switches_list, &the_extension->Switch.Node ); _Chain_Append( &_User_extensions_Switches_list, &the_extension->Switch.Node );
@@ -97,7 +98,16 @@ RTEMS_INLINE_ROUTINE void _User_extensions_Add_API_set (
User_extensions_Control *the_extension User_extensions_Control *the_extension
) )
{ {
_User_extensions_Add_set( the_extension ); _Chain_Append( &_User_extensions_List, &the_extension->Node );
/*
* If a switch handler is present, append it to the switch chain.
*/
if ( extension_table->thread_switch != NULL ) {
_Chain_Append(
&_User_extensions_Switches_list, &the_extension->Switch.Node );
}
} }
/*PAGE /*PAGE

69
cpukit/score/macros/rtems/score/userext.inl
View File

@@ -23,20 +23,28 @@
*/ */
#define _User_extensions_Handler_initialization( \ #define _User_extensions_Handler_initialization( \
number_of_extensions, _initial_extensions \ _number_of_extensions, _initial_extensions \
) \ ) \
{ \ { \
User_extensions_Control *extension; \ User_extensions_Control *extension; \
unsigned32 i; \ unsigned32 i; \
\
_Chain_Initialize_empty( &_User_extensions_List ); \ _Chain_Initialize_empty( &_User_extensions_List ); \
_Chain_Initialize_empty( &_User_extensions_Switches_list ); \
\ \
if ( (_initial_extensions) ) { \ if ( (_initial_extensions) ) { \
for (i=0 ; i<number_of_extensions ; i++ ) { \ extension = _Workspace_Allocate_or_fatal_error( \
extension = \ sizeof(User_extensions_Control) * _number_of_extensions ); \
_Workspace_Allocate_or_fatal_error( sizeof(User_extensions_Control) ); \ \
\ memset ( \
extension->Callouts = _initial_extensions[i]; \ extension, \
_Chain_Append( &_User_extensions_List, &extension->Node ); \ 0, \
_number_of_extensions * sizeof( User_extensions_Control ) \
); \
\
for ( i = 0 ; i < _number_of_extensions ; i++ ) { \
_User_extensions_Add_set (extension, &_initial_extensions[i]); \
extension++; \
} \ } \
} \ } \
} }
@@ -50,16 +58,33 @@
do { \ do { \
(_the_extension)->Callouts = *(_extension_table); \ (_the_extension)->Callouts = *(_extension_table); \
\ \
_Chain_Append( &_User_extensions_List, &(_the_extension)->Node ); \ _Chain_Prepend( &_User_extensions_List, &(_the_extension)->Node ); \
\
if ( (_the_extension)->Callouts.thread_switch != NULL ) { \
(_the_extension)->Switch.thread_switch = \
(_the_extension)->Callouts.thread_switch; \
_Chain_Append( \
&_User_extensions_Switches_list, \
&(_the_extension)->Switch.Node \
); \
} \
} while ( 0 ) } while ( 0 )
/*PAGE /*PAGE
* *
* _User_extensions_Add_API_set * _User_extensions_Add_API_set
*/ */
#define _User_extensions_Add_API_set( _the_extension ) \ #define _User_extensions_Add_API_set( _the_extension ) \
_Chain_Prepend( &_User_extensions_List, &(_the_extension)->Node ) do { \
_Chain_Prepend( &_User_extensions_List, &(_the_extension)->Node ); \
\
if ( (_the_extension)->Callouts.thread_switch != NULL ) { \
_Chain_Append( \
&_User_extensions_Switches_list, &(_the_extension)->Switch.Node ); \
} \
} while ( 0 )
/*PAGE /*PAGE
@@ -68,7 +93,13 @@
*/ */
#define _User_extensions_Remove_set( _the_extension ) \ #define _User_extensions_Remove_set( _the_extension ) \
_Chain_Extract( &(_the_extension)->Node ) do { \
_Chain_Extract( &(_the_extension)->Node ); \
\
if ( (_the_extension)->Callouts.thread_switch != NULL ) { \
_Chain_Extract( &(_the_extension)->Node ); \
} \
} while (0)
/*PAGE /*PAGE
* *
@@ -78,13 +109,13 @@
* messing up the name and function call expansion. * messing up the name and function call expansion.
*/ */
#define _User_extensions_Run_list_forward( _name, _arguments ) \ #define _User_extensions_Run_list_forward( _list, _name, _arguments ) \
do { \ do { \
Chain_Node *the_node; \ Chain_Node *the_node; \
User_extensions_Control *the_extension; \ User_extensions_Control *the_extension; \
\ \
for ( the_node = _User_extensions_List.first ; \ for ( the_node = (_list).first ; \
!_Chain_Is_tail( &_User_extensions_List, the_node ) ; \ !_Chain_Is_tail( &(_list), the_node ) ; \
the_node = the_node->next ) { \ the_node = the_node->next ) { \
the_extension = (User_extensions_Control *) the_node; \ the_extension = (User_extensions_Control *) the_node; \
\ \
@@ -103,13 +134,13 @@
* messing up the name and function call expansion. * messing up the name and function call expansion.
*/ */
#define _User_extensions_Run_list_backward( _name, _arguments ) \ #define _User_extensions_Run_list_backward( _list, _name, _arguments ) \
do { \ do { \
Chain_Node *the_node; \ Chain_Node *the_node; \
User_extensions_Control *the_extension; \ User_extensions_Control *the_extension; \
\ \
for ( the_node = _User_extensions_List.last ; \ for ( the_node = (_list).last ; \
!_Chain_Is_head( &_User_extensions_List, the_node ) ; \ !_Chain_Is_head( &(_list), the_node ) ; \
the_node = the_node->previous ) { \ the_node = the_node->previous ) { \
the_extension = (User_extensions_Control *) the_node; \ the_extension = (User_extensions_Control *) the_node; \
\ \
@@ -127,7 +158,11 @@
*/ */
#define _User_extensions_Thread_switch( _executing, _heir ) \ #define _User_extensions_Thread_switch( _executing, _heir ) \
_User_extensions_Run_list_forward(thread_switch, (_executing, _heir) ) _User_extensions_Run_list_forward( \
_User_extensions_Switches_list, \
thread_switch, \
(_executing, _heir) \
)
#endif #endif
/* end of include file */ /* end of include file */