Ticket #142: tswitch-speedup.diff

Index: posix/src/pthread.c
===================================================================
RCS file: /usr1/CVS/rtems/c/src/exec/posix/src/pthread.c,v
retrieving revision 1.54
diff -c -r1.54 pthread.c
*** posix/src/pthread.c 2001/01/24 14:17:28     1.54
--- posix/src/pthread.c 2002/03/19 12:59:09
***************
*** 311,316 ****
--- 311,317 ----
   
  User_extensions_Control _POSIX_Threads_User_extensions = {
    { NULL, NULL },
+   { { NULL, NULL }, NULL },
    { _POSIX_Threads_Create_extension,          /* create */
      NULL,                                     /* start */
      NULL,                                     /* restart */
Index: rtems/src/tasks.c
===================================================================
RCS file: /usr1/CVS/rtems/c/src/exec/rtems/src/tasks.c,v
retrieving revision 1.35
diff -c -r1.35 tasks.c
*** rtems/src/tasks.c   2001/09/21 13:57:57     1.35
--- rtems/src/tasks.c   2002/03/19 12:59:09
***************
*** 205,210 ****
--- 205,211 ----
  
  User_extensions_Control _RTEMS_tasks_User_extensions = {
    { NULL, NULL },
+   { { NULL, NULL }, NULL },
    { _RTEMS_tasks_Create_extension,            /* create */
      _RTEMS_tasks_Start_extension,             /* start */
      _RTEMS_tasks_Start_extension,             /* restart */
Index: score/include/rtems/score/userext.h
===================================================================
RCS file: /usr1/CVS/rtems/c/src/exec/score/include/rtems/score/userext.h,v
retrieving revision 1.15
diff -c -r1.15 userext.h
*** score/include/rtems/score/userext.h 1999/11/17 17:50:37     1.15
--- score/include/rtems/score/userext.h 2002/03/19 12:59:09
***************
*** 91,102 ****
  }   User_extensions_Table;
  
  /*
   *  The following is used to manage each user extension set.
   */
  
  typedef struct {
!   Chain_Node              Node;
!   User_extensions_Table   Callouts;
  }   User_extensions_Control;
  
  /*
--- 91,115 ----
  }   User_extensions_Table;
  
  /*
+  *  The following is used to manage the list of switch handlers.
+  */
+ 
+ typedef struct {
+   Chain_Node                              Node;
+   User_extensions_thread_switch_extension thread_switch;
+ }   User_extensions_switch_Control;
+ 
+ /*
   *  The following is used to manage each user extension set.
+  *  The switch control is part of the extensions control even
+  *  if not used due to the extension not having a switch
+  *  handler.
   */
  
  typedef struct {
!   Chain_Node                     Node;
!   User_extensions_switch_Control Switch;
!   User_extensions_Table          Callouts;
  }   User_extensions_Control;
  
  /*
***************
*** 104,109 ****
--- 117,129 ----
   */
  
  SCORE_EXTERN Chain_Control _User_extensions_List;
+ 
+ /*
+  *  The following is used to manage a chain of user extension task
+  *  switch nodes.
+  */
+ 
+ SCORE_EXTERN Chain_Control _User_extensions_switches_List;
  
  /*
   *  _User_extensions_Thread_create
Index: score/inline/rtems/score/userext.inl
===================================================================
RCS file: /usr1/CVS/rtems/c/src/exec/score/inline/rtems/score/userext.inl,v
retrieving revision 1.13
diff -c -r1.13 userext.inl
*** score/inline/rtems/score/userext.inl        1999/11/17 17:50:37     1.13
--- score/inline/rtems/score/userext.inl        2002/03/19 12:59:09
***************
*** 20,70 ****
  
  /*PAGE
   *
!  *  _User_extensions_Handler_initialization
   *
   *  DESCRIPTION:
   *
!  *  This routine performs the initialization necessary for this handler.
   */
  
! RTEMS_INLINE_ROUTINE void _User_extensions_Handler_initialization (
!     unsigned32              number_of_extensions,
!     User_extensions_Table  *initial_extensions
  )
  {
!   User_extensions_Control *extension;
!   unsigned32               i;
! 
!   _Chain_Initialize_empty( &_User_extensions_List );
  
!   if ( initial_extensions ) {
!     for (i=0 ; i<number_of_extensions ; i++ ) {
!       extension =
!          _Workspace_Allocate_or_fatal_error( sizeof(User_extensions_Control) );
  
!       extension->Callouts = initial_extensions[i];
!       _Chain_Append( &_User_extensions_List, &extension->Node );
!     }
    }
  }
  
  /*PAGE
   *
!  *  _User_extensions_Add_set
   *
   *  DESCRIPTION:
   *
!  *  This routine is used to add a user extension set to the active list.
   */
  
! RTEMS_INLINE_ROUTINE void _User_extensions_Add_set (
!   User_extensions_Control *the_extension,
!   User_extensions_Table   *extension_table
  )
  {
!   the_extension->Callouts = *extension_table;
  
!   _Chain_Append( &_User_extensions_List, &the_extension->Node );
  }
  
  /*PAGE
--- 20,87 ----
  
  /*PAGE
   *
!  *  _User_extensions_Add_set
   *
   *  DESCRIPTION:
   *
!  *  This routine is used to add a user extension set to the active list.
   */
  
! RTEMS_INLINE_ROUTINE void _User_extensions_Add_set (
!   User_extensions_Control *the_extension,
!   User_extensions_Table   *extension_table
  )
  {
!   the_extension->Callouts = *extension_table;
  
!   _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 ) {
!     the_extension->Switch.thread_switch = extension_table->thread_switch;
!     _Chain_Append( &_User_extensions_switches_List, &the_extension->Switch.Node );
    }
  }
  
  /*PAGE
   *
!  *  _User_extensions_Handler_initialization
   *
   *  DESCRIPTION:
   *
!  *  This routine performs the initialization necessary for this handler.
   */
  
! RTEMS_INLINE_ROUTINE void _User_extensions_Handler_initialization (
!     unsigned32              number_of_extensions,
!     User_extensions_Table  *initial_extensions
  )
  {
!   User_extensions_Control *extension;
!   unsigned32               i;
  
!   _Chain_Initialize_empty( &_User_extensions_List );
!   _Chain_Initialize_empty( &_User_extensions_switches_List );
! 
!   if ( initial_extensions ) {
!     extension = 
!       _Workspace_Allocate_or_fatal_error(
!         number_of_extensions * sizeof( User_extensions_Control )
!       );
!   
!     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++;
!     }
!   }
  }
  
  /*PAGE
***************
*** 80,87 ****
  )
  {
    _Chain_Prepend( &_User_extensions_List, &the_extension->Node );
  }
!  
  /*PAGE
   *
   *  _User_extensions_Remove_set
--- 97,112 ----
  )
  {
    _Chain_Prepend( &_User_extensions_List, &the_extension->Node );
+ 
+   /*
+    * If a switch handler is present, append it to the switch chain.
+    */
+   if ( the_extension->Callouts.thread_switch != NULL ) {
+     the_extension->Switch.thread_switch = the_extension->Callouts.thread_switch;
+     _Chain_Prepend( &_User_extensions_switches_List, &the_extension->Switch.Node );
+   }
  }
! 
  /*PAGE
   *
   *  _User_extensions_Remove_set
***************
*** 96,101 ****
--- 121,133 ----
  )
  {
    _Chain_Extract( &the_extension->Node );
+   
+   /*
+    * If a switch handler is present, remove it.
+    */
+ 
+   if ( the_extension->Callouts.thread_switch != NULL )
+     _Chain_Extract( &the_extension->Switch.Node );
  }
  
  /*PAGE
***************
*** 113,129 ****
    Thread_Control *heir
  )
  {
!   Chain_Node              *the_node;
!   User_extensions_Control *the_extension;
! 
!   for ( the_node = _User_extensions_List.first ;
!         !_Chain_Is_tail( &_User_extensions_List, the_node ) ;
          the_node = the_node->next ) {
  
!     the_extension = (User_extensions_Control *) the_node;
  
!     if ( the_extension->Callouts.thread_switch != NULL )
!       (*the_extension->Callouts.thread_switch)( executing, heir );
    }
  }
  
--- 145,160 ----
    Thread_Control *heir
  )
  {
!   Chain_Node                     *the_node;
!   User_extensions_switch_Control *the_extension_switch;
!   
!   for ( the_node = _User_extensions_switches_List.first ;
!         !_Chain_Is_tail( &_User_extensions_switches_List, the_node ) ;
          the_node = the_node->next ) {
  
!     the_extension_switch = (User_extensions_switch_Control *) the_node;
  
!     (*the_extension_switch->thread_switch)( executing, heir );
    }
  }