Changeset 92f50c3 in rtems


Ignore:
Timestamp:
Feb 17, 2014, 8:47:12 AM (6 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
4.11, master
Children:
514705d
Parents:
801b5d8
git-author:
Sebastian Huber <sebastian.huber@…> (02/17/14 08:47:12)
git-committer:
Sebastian Huber <sebastian.huber@…> (02/19/14 08:59:38)
Message:

score: Add SYSTEM_STATE_TERMINATED

Merge systems states SYSTEM_STATE_SHUTDOWN and SYSTEM_STATE_FAILED into
new system state SYSTEM_STATE_TERMINATED. This reflects that all system
termination paths end up in _Internal_error_Occurred().

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • cpukit/sapi/src/exshutdown.c

    r801b5d8 r92f50c3  
    4545
    4646    _Thread_Set_global_exit_status( result );
    47     _System_state_Set( SYSTEM_STATE_SHUTDOWN );
    4847    _Thread_Stop_multitasking();
    4948
  • cpukit/score/include/rtems/score/interr.h

    r801b5d8 r92f50c3  
    193193 * Once all fatal handler executed the error information will be stored to
    194194 * _Internal_errors_What_happened and the system state is set to
    195  * SYSTEM_STATE_FAILED.
     195 * SYSTEM_STATE_TERMINATED.
    196196 *
    197197 * The final step is to call the CPU specific _CPU_Fatal_halt().
  • cpukit/score/include/rtems/score/sysstate.h

    r801b5d8 r92f50c3  
    5555
    5656  /**
    57    * @brief The system is in the midst of a shutdown.
     57   * @brief The system reached its terminal state.
    5858   */
    59   SYSTEM_STATE_SHUTDOWN,
    60 
    61   /**
    62    * @brief A fatal error has occurred.
    63    */
    64   SYSTEM_STATE_FAILED
     59  SYSTEM_STATE_TERMINATED
    6560} System_state_Codes;
    6661
    6762#define SYSTEM_STATE_CODES_FIRST SYSTEM_STATE_BEFORE_INITIALIZATION
    6863
    69 #define SYSTEM_STATE_CODES_LAST SYSTEM_STATE_FAILED
     64#define SYSTEM_STATE_CODES_LAST SYSTEM_STATE_TERMINATED
    7065
    7166#if defined(RTEMS_MULTIPROCESSING)
     
    115110}
    116111
    117 RTEMS_INLINE_ROUTINE bool _System_state_Is_shutdown (
    118   System_state_Codes state
    119 )
    120 {
    121   return (state == SYSTEM_STATE_SHUTDOWN);
    122 }
    123 
    124112RTEMS_INLINE_ROUTINE bool _System_state_Is_up (
    125113  System_state_Codes state
     
    129117}
    130118
    131 RTEMS_INLINE_ROUTINE bool _System_state_Is_failed (
     119RTEMS_INLINE_ROUTINE bool _System_state_Is_terminated (
    132120  System_state_Codes state
    133121)
    134122{
    135   return (state == SYSTEM_STATE_FAILED);
     123  return (state == SYSTEM_STATE_TERMINATED);
    136124}
    137125
  • cpukit/score/src/interr.c

    r801b5d8 r92f50c3  
    3939  _Internal_errors_What_happened.the_error   = the_error;
    4040
    41   _System_state_Set( SYSTEM_STATE_FAILED );
     41  _System_state_Set( SYSTEM_STATE_TERMINATED );
    4242
    4343  _CPU_Fatal_halt( the_error );
  • testsuites/libtests/heapwalk/init.c

    r801b5d8 r92f50c3  
    9595  rtems_interrupt_disable( level );
    9696  System_state_Codes state = _System_state_Get();
    97   _System_state_Set( SYSTEM_STATE_FAILED );
     97  _System_state_Set( SYSTEM_STATE_TERMINATED );
    9898  test_call_heap_walk( true );
    9999  _System_state_Set( state );
  • testsuites/sptests/spfatal23/testcase.h

    r801b5d8 r92f50c3  
    1818void force_error()
    1919{
    20   _System_state_Set( SYSTEM_STATE_SHUTDOWN );
     20  _System_state_Set( SYSTEM_STATE_BEFORE_MULTITASKING );
    2121  rtems_shutdown_executive( 0 );
    2222  /* we will not run this far */
Note: See TracChangeset for help on using the changeset viewer.