From aadb6b0db7a62f6e0e41589be6893ef45d0ebacb Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 8 Apr 2002 18:21:47 +0000 Subject: 2001-04-08 Joel Sherrill * 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. --- c/src/exec/score/ChangeLog | 6 +++ c/src/exec/score/inline/rtems/score/userext.inl | 12 ++++- c/src/exec/score/macros/rtems/score/userext.inl | 71 ++++++++++++++++++------- 3 files changed, 70 insertions(+), 19 deletions(-) (limited to 'c/src/exec/score') diff --git a/c/src/exec/score/ChangeLog b/c/src/exec/score/ChangeLog index a4cfbc927d..0e2e1f7029 100644 --- a/c/src/exec/score/ChangeLog +++ b/c/src/exec/score/ChangeLog @@ -1,3 +1,9 @@ +2001-04-08 Joel Sherrill + + * 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 * Per PR142, make task switch extension its own list. diff --git a/c/src/exec/score/inline/rtems/score/userext.inl b/c/src/exec/score/inline/rtems/score/userext.inl index 9c8cb43731..0d0b19f9ec 100644 --- a/c/src/exec/score/inline/rtems/score/userext.inl +++ b/c/src/exec/score/inline/rtems/score/userext.inl @@ -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 ( extension_table->thread_switch != NULL ) { the_extension->Switch.thread_switch = extension_table->thread_switch; _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_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 diff --git a/c/src/exec/score/macros/rtems/score/userext.inl b/c/src/exec/score/macros/rtems/score/userext.inl index 8be1502778..f08c5d81db 100644 --- a/c/src/exec/score/macros/rtems/score/userext.inl +++ b/c/src/exec/score/macros/rtems/score/userext.inl @@ -23,20 +23,28 @@ */ #define _User_extensions_Handler_initialization( \ - number_of_extensions, _initial_extensions \ + _number_of_extensions, _initial_extensions \ ) \ { \ User_extensions_Control *extension; \ unsigned32 i; \ + \ _Chain_Initialize_empty( &_User_extensions_List ); \ + _Chain_Initialize_empty( &_User_extensions_Switches_list ); \ \ if ( (_initial_extensions) ) { \ - for (i=0 ; iCallouts = _initial_extensions[i]; \ - _Chain_Append( &_User_extensions_List, &extension->Node ); \ + extension = _Workspace_Allocate_or_fatal_error( \ + sizeof(User_extensions_Control) * _number_of_extensions ); \ + \ + memset ( \ + extension, \ + 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,8 +58,18 @@ do { \ (_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 ) + /*PAGE * @@ -59,16 +77,29 @@ */ #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 * * _User_extensions_Remove_set */ #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 * @@ -78,13 +109,13 @@ * 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 { \ Chain_Node *the_node; \ User_extensions_Control *the_extension; \ \ - for ( the_node = _User_extensions_List.first ; \ - !_Chain_Is_tail( &_User_extensions_List, the_node ) ; \ + for ( the_node = (_list).first ; \ + !_Chain_Is_tail( &(_list), the_node ) ; \ the_node = the_node->next ) { \ the_extension = (User_extensions_Control *) the_node; \ \ @@ -103,13 +134,13 @@ * 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 { \ Chain_Node *the_node; \ User_extensions_Control *the_extension; \ \ - for ( the_node = _User_extensions_List.last ; \ - !_Chain_Is_head( &_User_extensions_List, the_node ) ; \ + for ( the_node = (_list).last ; \ + !_Chain_Is_head( &(_list), the_node ) ; \ the_node = the_node->previous ) { \ the_extension = (User_extensions_Control *) the_node; \ \ @@ -127,7 +158,11 @@ */ #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 /* end of include file */ -- cgit v1.2.3