Changeset b2dbb634 in rtems


Ignore:
Timestamp:
Oct 10, 2017, 9:36:23 AM (18 months ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
157c767
Parents:
a3ad4af
git-author:
Sebastian Huber <sebastian.huber@…> (10/10/17 09:36:23)
git-committer:
Sebastian Huber <sebastian.huber@…> (10/11/17 05:37:58)
Message:

score: Remove CPU_set_Control

Use Processor_mask instead.

Update #2514.

Files:
4 deleted
13 edited

Legend:

Unmodified
Added
Removed
  • cpukit/posix/src/pthread.c

    ra3ad4af rb2dbb634  
    3939#include <rtems/posix/keyimpl.h>
    4040#include <rtems/score/assert.h>
    41 #include <rtems/score/cpusetimpl.h>
    4241#include <rtems/score/schedulerimpl.h>
    4342
  • cpukit/posix/src/pthreadsetaffinitynp.c

    ra3ad4af rb2dbb634  
    2626
    2727#include <rtems/score/threadimpl.h>
    28 #include <rtems/score/cpusetimpl.h>
    2928#include <rtems/score/schedulerimpl.h>
    3029
  • cpukit/rtems/src/schedulergetprocessorset.c

    ra3ad4af rb2dbb634  
    1818
    1919#include <rtems/rtems/tasks.h>
    20 #include <rtems/score/cpusetimpl.h>
    2120#include <rtems/score/schedulerimpl.h>
    2221
  • cpukit/rtems/src/taskgetaffinity.c

    ra3ad4af rb2dbb634  
    2121#include <rtems/rtems/tasks.h>
    2222#include <rtems/score/threadimpl.h>
    23 #include <rtems/score/cpusetimpl.h>
    2423#include <rtems/score/schedulerimpl.h>
    2524
  • cpukit/rtems/src/tasksetaffinity.c

    ra3ad4af rb2dbb634  
    2121#include <rtems/rtems/tasks.h>
    2222#include <rtems/score/threadimpl.h>
    23 #include <rtems/score/cpusetimpl.h>
    2423#include <rtems/score/schedulerimpl.h>
    2524
  • cpukit/score/Makefile.am

    ra3ad4af rb2dbb634  
    4242include_rtems_score_HEADERS += include/rtems/score/coresem.h
    4343include_rtems_score_HEADERS += include/rtems/score/coresemimpl.h
    44 include_rtems_score_HEADERS += include/rtems/score/cpuset.h
    45 include_rtems_score_HEADERS += include/rtems/score/cpusetimpl.h
    4644include_rtems_score_HEADERS += include/rtems/score/cpustdatomic.h
    4745include_rtems_score_HEADERS += include/rtems/score/heap.h
     
    157155libscore_a_SOURCES += src/smplock.c
    158156libscore_a_SOURCES += src/smpmulticastaction.c
    159 libscore_a_SOURCES += src/cpuset.c
    160 libscore_a_SOURCES += src/cpusetprintsupport.c
    161157libscore_a_SOURCES += src/schedulerdefaultaskforhelp.c
    162158libscore_a_SOURCES += src/schedulerdefaultsetaffinity.c
  • cpukit/score/include/rtems/score/schedulerimpl.h

    ra3ad4af rb2dbb634  
    2323#include <rtems/score/scheduler.h>
    2424#include <rtems/score/assert.h>
    25 #include <rtems/score/cpusetimpl.h>
    2625#include <rtems/score/priorityimpl.h>
    2726#include <rtems/score/smpimpl.h>
  • cpukit/score/include/rtems/score/schedulerpriorityaffinitysmp.h

    ra3ad4af rb2dbb634  
    2323#include <rtems/score/schedulersmp.h>
    2424#include <rtems/score/schedulerprioritysmp.h>
    25 #include <rtems/score/cpuset.h>
     25
     26#include <sys/cpuset.h>
    2627
    2728#ifdef __cplusplus
     
    169170   * Structure containing affinity set data and size
    170171   */
    171   CPU_set_Control Affinity;
     172  cpu_set_t affinity;
    172173} Scheduler_priority_affinity_SMP_Node;
    173174
  • cpukit/score/include/rtems/sysinit.h

    ra3ad4af rb2dbb634  
    3232#define RTEMS_SYSINIT_MP_EARLY                   000301
    3333#define RTEMS_SYSINIT_DATA_STRUCTURES            000302
    34 #define RTEMS_SYSINIT_CPU_SET                    00030d
    3534#define RTEMS_SYSINIT_MP                         00030e
    3635#define RTEMS_SYSINIT_USER_EXTENSIONS            000320
  • cpukit/score/preinstall.am

    ra3ad4af rb2dbb634  
    132132        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/coresemimpl.h
    133133PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/coresemimpl.h
    134 
    135 $(PROJECT_INCLUDE)/rtems/score/cpuset.h: include/rtems/score/cpuset.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    136         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuset.h
    137 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuset.h
    138 
    139 $(PROJECT_INCLUDE)/rtems/score/cpusetimpl.h: include/rtems/score/cpusetimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    140         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpusetimpl.h
    141 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpusetimpl.h
    142134
    143135$(PROJECT_INCLUDE)/rtems/score/cpustdatomic.h: include/rtems/score/cpustdatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
  • cpukit/score/src/schedulerpriorityaffinitysmp.c

    ra3ad4af rb2dbb634  
    8585   */
    8686  the_node = _Scheduler_priority_affinity_SMP_Node_downcast( node );
    87   the_node->Affinity     = *_CPU_set_Default();
    88   the_node->Affinity.set = &the_node->Affinity.preallocated;
     87  _Processor_mask_To_cpu_set_t(
     88    _SMP_Get_online_processors(),
     89    sizeof( the_node->affinity ),
     90    &the_node->affinity
     91  );
    8992}
    9093
     
    154157       * Can this thread run on this CPU?
    155158       */
    156       if ( CPU_ISSET( (int) victim_cpu_index, node->Affinity.set ) ) {
     159      if ( CPU_ISSET( (int) victim_cpu_index, &node->affinity ) ) {
    157160        highest = &node->Base.Base.Base;
    158161        break;
     
    246249    cpu_index = _Per_CPU_Get_index( _Thread_Get_CPU( thread ) );
    247250
    248     if ( CPU_ISSET( (int) cpu_index, filter->Affinity.set ) ) {
     251    if ( CPU_ISSET( (int) cpu_index, &filter->affinity ) ) {
    249252      lowest_scheduled = &node->Base.Base.Base;
    250253      break;
     
    624627   * doing anything.
    625628   */
    626   if ( CPU_EQUAL( &cpuset, node->Affinity.set ) )
     629  if ( CPU_EQUAL( &cpuset, &node->affinity ) )
    627630    return true;
    628631
     
    633636  }
    634637
    635   CPU_COPY( &cpuset, node->Affinity.set );
     638  CPU_COPY( &cpuset, &node->affinity );
    636639
    637640  if ( _States_Is_ready( current_state ) ) {
  • cpukit/score/src/threadinitialize.c

    ra3ad4af rb2dbb634  
    2626#include <rtems/score/watchdogimpl.h>
    2727#include <rtems/score/wkspace.h>
    28 #include <rtems/score/cpusetimpl.h>
    2928#include <rtems/config.h>
    3029
  • testsuites/sptests/spsysinit01/init.c

    ra3ad4af rb2dbb634  
    7373  DATA_STRUCTURES_PRE,
    7474  DATA_STRUCTURES_POST,
    75   CPU_SET_PRE,
    76   CPU_SET_POST,
    7775  USER_EXTENSIONS_PRE,
    7876  USER_EXTENSIONS_POST,
     
    246244}
    247245
    248 FIRST(RTEMS_SYSINIT_CPU_SET)
    249 {
    250   /* There is nothing to do in case RTEMS_SMP is not defined */
    251   next_step(CPU_SET_PRE);
    252 }
    253 
    254 LAST(RTEMS_SYSINIT_CPU_SET)
    255 {
    256   next_step(CPU_SET_POST);
    257 }
    258 
    259246FIRST(RTEMS_SYSINIT_USER_EXTENSIONS)
    260247{
Note: See TracChangeset for help on using the changeset viewer.