Changeset 133d54c5 in rtems for cpukit/sapi


Ignore:
Timestamp:
Apr 9, 2014, 8:33:00 AM (5 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
4.11, master
Children:
b427a92
Parents:
0712d17
git-author:
Sebastian Huber <sebastian.huber@…> (04/09/14 08:33:00)
git-committer:
Sebastian Huber <sebastian.huber@…> (04/15/14 06:37:12)
Message:

score: Add scheduler name

Location:
cpukit/sapi/include
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • cpukit/sapi/include/confdefs.h

    r0712d17 r133d54c5  
    667667 */
    668668#if defined(CONFIGURE_SCHEDULER_PRIORITY)
     669  #if !defined(CONFIGURE_SCHEDULER_NAME)
     670    #define CONFIGURE_SCHEDULER_NAME rtems_build_name('U', 'P', 'D', ' ')
     671  #endif
     672
    669673  #if !defined(CONFIGURE_SCHEDULER_CONTROLS)
    670674    #define CONFIGURE_SCHEDULER_CONTEXT \
     
    675679
    676680    #define CONFIGURE_SCHEDULER_CONTROLS \
    677       RTEMS_SCHEDULER_CONTROL_PRIORITY(dflt)
     681      RTEMS_SCHEDULER_CONTROL_PRIORITY(dflt, CONFIGURE_SCHEDULER_NAME)
    678682  #endif
    679683#endif
     
    684688 */
    685689#if defined(CONFIGURE_SCHEDULER_PRIORITY_SMP)
     690  #if !defined(CONFIGURE_SCHEDULER_NAME)
     691    #define CONFIGURE_SCHEDULER_NAME rtems_build_name('M', 'P', 'D', ' ')
     692  #endif
     693
    686694  #if !defined(CONFIGURE_SCHEDULER_CONTROLS)
    687695    #define CONFIGURE_SCHEDULER_CONTEXT \
     
    692700
    693701    #define CONFIGURE_SCHEDULER_CONTROLS \
    694       RTEMS_SCHEDULER_CONTROL_PRIORITY_SMP(dflt)
     702      RTEMS_SCHEDULER_CONTROL_PRIORITY_SMP(dflt, CONFIGURE_SCHEDULER_NAME)
    695703  #endif
    696704#endif
     
    701709 */
    702710#if defined(CONFIGURE_SCHEDULER_PRIORITY_AFFINITY_SMP)
     711  #if !defined(CONFIGURE_SCHEDULER_NAME)
     712    #define CONFIGURE_SCHEDULER_NAME rtems_build_name('M', 'P', 'A', ' ')
     713  #endif
     714
    703715  #if !defined(CONFIGURE_SCHEDULER_CONTROLS)
    704716    #define CONFIGURE_SCHEDULER_CONTEXT \
     
    709721
    710722    #define CONFIGURE_SCHEDULER_CONTROLS \
    711       RTEMS_SCHEDULER_CONTROL_PRIORITY_AFFINITY_SMP(dflt)
     723      RTEMS_SCHEDULER_CONTROL_PRIORITY_AFFINITY_SMP( \
     724        dflt, \
     725        CONFIGURE_SCHEDULER_NAME \
     726      )
    712727  #endif
    713728#endif
     
    717732 */
    718733#if defined(CONFIGURE_SCHEDULER_SIMPLE)
     734  #if !defined(CONFIGURE_SCHEDULER_NAME)
     735    #define CONFIGURE_SCHEDULER_NAME rtems_build_name('U', 'P', 'S', ' ')
     736  #endif
     737
    719738  #if !defined(CONFIGURE_SCHEDULER_CONTROLS)
    720739    #define CONFIGURE_SCHEDULER_CONTEXT RTEMS_SCHEDULER_CONTEXT_SIMPLE(dflt)
    721740
    722     #define CONFIGURE_SCHEDULER_CONTROLS RTEMS_SCHEDULER_CONTROL_SIMPLE(dflt)
     741    #define CONFIGURE_SCHEDULER_CONTROLS \
     742      RTEMS_SCHEDULER_CONTROL_SIMPLE(dflt, CONFIGURE_SCHEDULER_NAME)
    723743  #endif
    724744#endif
     
    728748 */
    729749#if defined(CONFIGURE_SCHEDULER_SIMPLE_SMP)
     750  #if !defined(CONFIGURE_SCHEDULER_NAME)
     751    #define CONFIGURE_SCHEDULER_NAME rtems_build_name('M', 'P', 'S', ' ')
     752  #endif
     753
    730754  #if !defined(CONFIGURE_SCHEDULER_CONTROLS)
    731755    #define CONFIGURE_SCHEDULER_CONTEXT \
     
    733757
    734758    #define CONFIGURE_SCHEDULER_CONTROLS \
    735       RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(dflt)
     759      RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(dflt, CONFIGURE_SCHEDULER_NAME)
    736760  #endif
    737761#endif
     
    741765 */
    742766#if defined(CONFIGURE_SCHEDULER_EDF)
     767  #if !defined(CONFIGURE_SCHEDULER_NAME)
     768    #define CONFIGURE_SCHEDULER_NAME rtems_build_name('U', 'E', 'D', 'F')
     769  #endif
     770
    743771  #if !defined(CONFIGURE_SCHEDULER_CONTROLS)
    744772    #define CONFIGURE_SCHEDULER_CONTEXT RTEMS_SCHEDULER_CONTEXT_EDF(dflt)
    745773
    746     #define CONFIGURE_SCHEDULER_CONTROLS RTEMS_SCHEDULER_CONTROL_EDF(dflt)
     774    #define CONFIGURE_SCHEDULER_CONTROLS \
     775      RTEMS_SCHEDULER_CONTROL_EDF(dflt, CONFIGURE_SCHEDULER_NAME)
    747776  #endif
    748777#endif
     
    752781 */
    753782#if defined(CONFIGURE_SCHEDULER_CBS)
     783  #if !defined(CONFIGURE_SCHEDULER_NAME)
     784    #define CONFIGURE_SCHEDULER_NAME rtems_build_name('U', 'C', 'B', 'S')
     785  #endif
     786
    754787  #if !defined(CONFIGURE_SCHEDULER_CONTROLS)
    755788    #define CONFIGURE_SCHEDULER_CONTEXT RTEMS_SCHEDULER_CONTEXT_CBS(dflt)
    756789
    757     #define CONFIGURE_SCHEDULER_CONTROLS RTEMS_SCHEDULER_CONTROL_CBS(dflt)
     790    #define CONFIGURE_SCHEDULER_CONTROLS \
     791      RTEMS_SCHEDULER_CONTROL_CBS(dflt, CONFIGURE_SCHEDULER_NAME)
    758792  #endif
    759793
     
    776810 */
    777811#ifdef CONFIGURE_INIT
    778   CONFIGURE_SCHEDULER_CONTEXT;
     812  #if defined(CONFIGURE_SCHEDULER_CONTEXT)
     813    CONFIGURE_SCHEDULER_CONTEXT;
     814  #endif
    779815
    780816  const Scheduler_Control _Scheduler_Table[] = {
  • cpukit/sapi/include/rtems/scheduler.h

    r0712d17 r133d54c5  
    4444    static Scheduler_EDF_Context RTEMS_SCHEDULER_CONTEXT_CBS_NAME( name )
    4545
    46   #define RTEMS_SCHEDULER_CONTROL_CBS( name ) \
     46  #define RTEMS_SCHEDULER_CONTROL_CBS( name, obj_name ) \
    4747    { \
    4848      &RTEMS_SCHEDULER_CONTEXT_CBS_NAME( name ).Base, \
    49       SCHEDULER_CBS_ENTRY_POINTS \
     49      SCHEDULER_CBS_ENTRY_POINTS, \
     50      ( obj_name ) \
    5051    }
    5152#endif
     
    6061    static Scheduler_EDF_Context RTEMS_SCHEDULER_CONTEXT_EDF_NAME( name )
    6162
    62   #define RTEMS_SCHEDULER_CONTROL_EDF( name ) \
     63  #define RTEMS_SCHEDULER_CONTROL_EDF( name, obj_name ) \
    6364    { \
    6465      &RTEMS_SCHEDULER_CONTEXT_EDF_NAME( name ).Base, \
    65       SCHEDULER_EDF_ENTRY_POINTS \
     66      SCHEDULER_EDF_ENTRY_POINTS, \
     67      ( obj_name ) \
    6668    }
    6769#endif
     
    7981    } RTEMS_SCHEDULER_CONTEXT_PRIORITY_NAME( name )
    8082
    81   #define RTEMS_SCHEDULER_CONTROL_PRIORITY( name ) \
     83  #define RTEMS_SCHEDULER_CONTROL_PRIORITY( name, obj_name ) \
    8284    { \
    8385      &RTEMS_SCHEDULER_CONTEXT_PRIORITY_NAME( name ).Base.Base, \
    84       SCHEDULER_PRIORITY_ENTRY_POINTS \
     86      SCHEDULER_PRIORITY_ENTRY_POINTS, \
     87      ( obj_name ) \
    8588    }
    8689#endif
     
    98101    } RTEMS_SCHEDULER_CONTEXT_PRIORITY_AFFINITY_SMP_NAME( name )
    99102
    100   #define RTEMS_SCHEDULER_CONTROL_PRIORITY_AFFINITY_SMP( name ) \
     103  #define RTEMS_SCHEDULER_CONTROL_PRIORITY_AFFINITY_SMP( name, obj_name ) \
    101104    { \
    102105      &RTEMS_SCHEDULER_CONTEXT_PRIORITY_AFFINITY_SMP_NAME( name ).Base.Base, \
    103       SCHEDULER_PRIORITY_AFFINITY_SMP_ENTRY_POINTS \
     106      SCHEDULER_PRIORITY_AFFINITY_SMP_ENTRY_POINTS, \
     107      ( obj_name ) \
    104108    }
    105109#endif
     
    117121    } RTEMS_SCHEDULER_CONTEXT_PRIORITY_SMP_NAME( name )
    118122
    119   #define RTEMS_SCHEDULER_CONTROL_PRIORITY_SMP( name ) \
     123  #define RTEMS_SCHEDULER_CONTROL_PRIORITY_SMP( name, obj_name ) \
    120124    { \
    121125      &RTEMS_SCHEDULER_CONTEXT_PRIORITY_SMP_NAME( name ).Base.Base, \
    122       SCHEDULER_PRIORITY_SMP_ENTRY_POINTS \
     126      SCHEDULER_PRIORITY_SMP_ENTRY_POINTS, \
     127      ( obj_name ) \
    123128    }
    124129#endif
     
    134139      RTEMS_SCHEDULER_CONTEXT_SIMPLE_NAME( name )
    135140
    136   #define RTEMS_SCHEDULER_CONTROL_SIMPLE( name ) \
     141  #define RTEMS_SCHEDULER_CONTROL_SIMPLE( name, obj_name ) \
    137142    { \
    138143      &RTEMS_SCHEDULER_CONTEXT_SIMPLE_NAME( name ).Base, \
    139       SCHEDULER_SIMPLE_ENTRY_POINTS \
     144      SCHEDULER_SIMPLE_ENTRY_POINTS, \
     145      ( obj_name ) \
    140146    }
    141147#endif
     
    151157      RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP_NAME( name )
    152158
    153   #define RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP( name ) \
     159  #define RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP( name, obj_name ) \
    154160    { \
    155161      &RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP_NAME( name ).Base, \
    156       SCHEDULER_SIMPLE_SMP_ENTRY_POINTS \
     162      SCHEDULER_SIMPLE_SMP_ENTRY_POINTS, \
     163      ( obj_name ) \
    157164    }
    158165#endif
Note: See TracChangeset for help on using the changeset viewer.