diff options
author | Joel Sherrill <joel@rtems.org> | 2017-01-11 09:43:06 -0600 |
---|---|---|
committer | Joel Sherrill <joel@rtems.org> | 2017-01-11 09:45:32 -0600 |
commit | 7a4b264574ce81d5473de6d15950464ea2cff485 (patch) | |
tree | 22affcf300a75df7faa368cc7adc3262de705f6d /cpukit | |
parent | Add support for posix_devctl() (diff) | |
download | rtems-7a4b264574ce81d5473de6d15950464ea2cff485.tar.bz2 |
Remove obsolete __RTEMS_HAVE_SYS_CPUSET_H__
Diffstat (limited to 'cpukit')
-rw-r--r-- | cpukit/configure.ac | 7 | ||||
-rw-r--r-- | cpukit/posix/include/rtems/posix/pthreadimpl.h | 2 | ||||
-rw-r--r-- | cpukit/posix/src/pthread.c | 10 | ||||
-rw-r--r-- | cpukit/posix/src/pthreadattrcompare.c | 30 | ||||
-rw-r--r-- | cpukit/posix/src/pthreadcreate.c | 6 | ||||
-rw-r--r-- | cpukit/rtems/include/rtems/rtems/tasks.h | 4 | ||||
-rw-r--r-- | cpukit/rtems/src/schedulergetprocessorset.c | 4 | ||||
-rw-r--r-- | cpukit/rtems/src/taskgetaffinity.c | 3 | ||||
-rw-r--r-- | cpukit/rtems/src/tasksetaffinity.c | 3 | ||||
-rw-r--r-- | cpukit/score/include/rtems/score/cpuset.h | 4 | ||||
-rw-r--r-- | cpukit/score/include/rtems/score/cpusetimpl.h | 3 | ||||
-rw-r--r-- | cpukit/score/include/rtems/score/scheduler.h | 6 | ||||
-rw-r--r-- | cpukit/score/include/rtems/score/schedulerimpl.h | 4 | ||||
-rw-r--r-- | cpukit/score/src/cpuset.c | 4 | ||||
-rw-r--r-- | cpukit/score/src/cpusetprintsupport.c | 95 | ||||
-rw-r--r-- | cpukit/score/src/schedulergetaffinity.c | 4 | ||||
-rw-r--r-- | cpukit/score/src/schedulersetaffinity.c | 4 |
17 files changed, 70 insertions, 123 deletions
diff --git a/cpukit/configure.ac b/cpukit/configure.ac index 3ebf5960e7..4410bf1f8f 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -119,7 +119,6 @@ RTEMS_CHECK_FUNC([pthread_getaffinity_np],[ RTEMS_CHECK_FUNC([pthread_getattr_np],[ #define _GNU_SOURCE #include <pthread.h>]) -AC_CHECK_HEADERS([sys/cpuset.h]) # This was added to newlib in August 2014 to improve conformance. # Disable use of internal definition if it is present. @@ -252,12 +251,6 @@ RTEMS_CPUOPT([RTEMS_VERSION], [RTEMS version string]) ## Header file differences that need to be known in .h after install -RTEMS_CPUOPT([__RTEMS_HAVE_SYS_CPUSET_H__], - [test x"${ac_cv_header_sys_cpuset_h}" = x"yes"], - [1], - [indicate if <sys/cpuset.h> is present in toolset]) - -## Header file differences that need to be known in .h after install RTEMS_CPUOPT([__RTEMS_HAVE_DECL_SIGALTSTACK__], [test x"${ac_cv_have_decl_sigaltstack}" = x"yes"], [1], diff --git a/cpukit/posix/include/rtems/posix/pthreadimpl.h b/cpukit/posix/include/rtems/posix/pthreadimpl.h index acf66822c0..90a60b6c4d 100644 --- a/cpukit/posix/include/rtems/posix/pthreadimpl.h +++ b/cpukit/posix/include/rtems/posix/pthreadimpl.h @@ -127,7 +127,7 @@ RTEMS_INLINE_ROUTINE void _POSIX_Threads_Copy_attributes( ) { *dst_attr = *src_attr; -#if defined(RTEMS_SMP) && defined(__RTEMS_HAVE_SYS_CPUSET_H__) +#if defined(RTEMS_SMP) _Assert( dst_attr->affinitysetsize == sizeof(dst_attr->affinitysetpreallocated) ); diff --git a/cpukit/posix/src/pthread.c b/cpukit/posix/src/pthread.c index e096dd6bea..65242f71b8 100644 --- a/cpukit/posix/src/pthread.c +++ b/cpukit/posix/src/pthread.c @@ -75,11 +75,9 @@ pthread_attr_t _POSIX_Threads_Default_attributes = { .cputime_clock_allowed = 1, /* cputime_clock_allowed */ #endif .detachstate = PTHREAD_CREATE_JOINABLE, /* detachstate */ - #if defined(__RTEMS_HAVE_SYS_CPUSET_H__) - .affinitysetsize = 0, - .affinityset = NULL, - .affinitysetpreallocated = {{0x0}} - #endif + .affinitysetsize = 0, + .affinityset = NULL, + .affinitysetpreallocated = {{0x0}} }; void _POSIX_Threads_Sporadic_timer( Watchdog_Control *watchdog ) @@ -244,7 +242,7 @@ User_extensions_Control _POSIX_Threads_User_extensions = { */ static void _POSIX_Threads_Manager_initialization(void) { - #if defined(RTEMS_SMP) && defined(__RTEMS_HAVE_SYS_CPUSET_H__) + #if defined(RTEMS_SMP) const CPU_set_Control *affinity; pthread_attr_t *attr; diff --git a/cpukit/posix/src/pthreadattrcompare.c b/cpukit/posix/src/pthreadattrcompare.c index 4cc40984f9..6a3b625be1 100644 --- a/cpukit/posix/src/pthreadattrcompare.c +++ b/cpukit/posix/src/pthreadattrcompare.c @@ -67,24 +67,22 @@ int rtems_pthread_attribute_compare( if ( attr1->detachstate != attr2->detachstate ) return 1; - #if defined(__RTEMS_HAVE_SYS_CPUSET_H__) - if ( attr1->affinitysetsize != attr2->affinitysetsize ) - return 1; + if ( attr1->affinitysetsize != attr2->affinitysetsize ) + return 1; - if (!CPU_EQUAL_S( - attr1->affinitysetsize, - attr1->affinityset, - attr2->affinityset - )) - return 1; + if (!CPU_EQUAL_S( + attr1->affinitysetsize, + attr1->affinityset, + attr2->affinityset + )) + return 1; - if (!CPU_EQUAL_S( - attr1->affinitysetsize, - &attr1->affinitysetpreallocated, - &attr2->affinitysetpreallocated - )) - return 1; - #endif + if (!CPU_EQUAL_S( + attr1->affinitysetsize, + &attr1->affinitysetpreallocated, + &attr2->affinitysetpreallocated + )) + return 1; return 0; } diff --git a/cpukit/posix/src/pthreadcreate.c b/cpukit/posix/src/pthreadcreate.c index a04ac00202..5c5ea5f4de 100644 --- a/cpukit/posix/src/pthreadcreate.c +++ b/cpukit/posix/src/pthreadcreate.c @@ -170,12 +170,10 @@ int pthread_create( } #if defined(RTEMS_SMP) -#if __RTEMS_HAVE_SYS_CPUSET_H__ - status = _CPU_set_Is_valid( the_attr->affinityset, the_attr->affinitysetsize ); + status = _CPU_set_Is_valid(the_attr->affinityset, the_attr->affinitysetsize); if ( !status ) return EINVAL; #endif -#endif /* * Currently all POSIX threads are floating point if the hardware @@ -224,7 +222,7 @@ int pthread_create( the_thread->Life.state |= THREAD_LIFE_CHANGE_DEFERRED; -#if defined(RTEMS_SMP) && __RTEMS_HAVE_SYS_CPUSET_H__ +#if defined(RTEMS_SMP) _ISR_lock_ISR_disable( &lock_context ); status = _Scheduler_Set_affinity( the_thread, diff --git a/cpukit/rtems/include/rtems/rtems/tasks.h b/cpukit/rtems/include/rtems/rtems/tasks.h index 6baefa0a8b..05f7ef325e 100644 --- a/cpukit/rtems/include/rtems/rtems/tasks.h +++ b/cpukit/rtems/include/rtems/rtems/tasks.h @@ -402,7 +402,6 @@ rtems_status_code rtems_task_is_suspended( rtems_id id ); -#if defined(__RTEMS_HAVE_SYS_CPUSET_H__) /** * @brief Gets the processor affinity set of a task. * @@ -458,7 +457,6 @@ rtems_status_code rtems_task_set_affinity( size_t cpusetsize, const cpu_set_t *cpuset ); -#endif /** * @brief Gets the scheduler of a task. @@ -561,7 +559,6 @@ rtems_status_code rtems_scheduler_ident( rtems_id *id ); -#if defined(__RTEMS_HAVE_SYS_CPUSET_H__) /** * @brief Gets the set of processors owned by the specified scheduler instance. * @@ -583,7 +580,6 @@ rtems_status_code rtems_scheduler_get_processor_set( size_t cpusetsize, cpu_set_t *cpuset ); -#endif /** * @brief Adds a processor to the set of processors owned by the specified diff --git a/cpukit/rtems/src/schedulergetprocessorset.c b/cpukit/rtems/src/schedulergetprocessorset.c index 275c563090..3b46ad07fc 100644 --- a/cpukit/rtems/src/schedulergetprocessorset.c +++ b/cpukit/rtems/src/schedulergetprocessorset.c @@ -16,8 +16,6 @@ #include "config.h" #endif -#if defined(__RTEMS_HAVE_SYS_CPUSET_H__) - #include <rtems/rtems/tasks.h> #include <rtems/score/cpusetimpl.h> #include <rtems/score/schedulerimpl.h> @@ -47,5 +45,3 @@ rtems_status_code rtems_scheduler_get_processor_set( return RTEMS_SUCCESSFUL; } - -#endif /* defined(__RTEMS_HAVE_SYS_CPUSET_H__) */ diff --git a/cpukit/rtems/src/taskgetaffinity.c b/cpukit/rtems/src/taskgetaffinity.c index b24966d047..4519534aee 100644 --- a/cpukit/rtems/src/taskgetaffinity.c +++ b/cpukit/rtems/src/taskgetaffinity.c @@ -18,8 +18,6 @@ #include "config.h" #endif -#if defined(__RTEMS_HAVE_SYS_CPUSET_H__) - #include <rtems/rtems/tasks.h> #include <rtems/score/threadimpl.h> #include <rtems/score/cpusetimpl.h> @@ -65,4 +63,3 @@ rtems_status_code rtems_task_get_affinity( _Thread_Dispatch_enable( cpu_self ); return ok ? RTEMS_SUCCESSFUL : RTEMS_INVALID_NUMBER; } -#endif diff --git a/cpukit/rtems/src/tasksetaffinity.c b/cpukit/rtems/src/tasksetaffinity.c index 6caf8620a3..290a13bb3a 100644 --- a/cpukit/rtems/src/tasksetaffinity.c +++ b/cpukit/rtems/src/tasksetaffinity.c @@ -18,8 +18,6 @@ #include "config.h" #endif -#if defined(__RTEMS_HAVE_SYS_CPUSET_H__) - #include <rtems/rtems/tasks.h> #include <rtems/score/threadimpl.h> #include <rtems/score/cpusetimpl.h> @@ -65,4 +63,3 @@ rtems_status_code rtems_task_set_affinity( _Thread_Dispatch_enable( cpu_self ); return ok ? RTEMS_SUCCESSFUL : RTEMS_INVALID_NUMBER; } -#endif diff --git a/cpukit/score/include/rtems/score/cpuset.h b/cpukit/score/include/rtems/score/cpuset.h index ebdb35dfd1..564f4a5efb 100644 --- a/cpukit/score/include/rtems/score/cpuset.h +++ b/cpukit/score/include/rtems/score/cpuset.h @@ -21,8 +21,6 @@ #include <rtems/score/basedefs.h> -#ifdef __RTEMS_HAVE_SYS_CPUSET_H__ - #include <sys/cpuset.h> #ifdef __cplusplus @@ -61,7 +59,5 @@ typedef struct { } #endif -#endif /* __RTEMS_HAVE_SYS_CPUSET_H__ */ - #endif /* _RTEMS_SCORE_CPUSET_H */ /* end of include file */ diff --git a/cpukit/score/include/rtems/score/cpusetimpl.h b/cpukit/score/include/rtems/score/cpusetimpl.h index f9a0f0fdfa..6a6bf9715e 100644 --- a/cpukit/score/include/rtems/score/cpusetimpl.h +++ b/cpukit/score/include/rtems/score/cpusetimpl.h @@ -28,8 +28,6 @@ extern "C" { #endif -#ifdef __RTEMS_HAVE_SYS_CPUSET_H__ - /** * @brief Determine If the CPU Set if Valid * @@ -121,7 +119,6 @@ static inline void _CPU_set_Set( set->setsize = setsize; CPU_COPY( set->set, cpuset ); } -#endif /**@}*/ diff --git a/cpukit/score/include/rtems/score/scheduler.h b/cpukit/score/include/rtems/score/scheduler.h index 7d461f81ff..fd59f16dee 100644 --- a/cpukit/score/include/rtems/score/scheduler.h +++ b/cpukit/score/include/rtems/score/scheduler.h @@ -20,7 +20,7 @@ #define _RTEMS_SCORE_SCHEDULER_H #include <rtems/score/thread.h> -#if defined(__RTEMS_HAVE_SYS_CPUSET_H__) && defined(RTEMS_SMP) +#if defined(RTEMS_SMP) #include <sys/cpuset.h> #endif @@ -212,7 +212,7 @@ typedef struct { struct Per_CPU_Control * ); -#if defined(__RTEMS_HAVE_SYS_CPUSET_H__) && defined(RTEMS_SMP) +#if defined(RTEMS_SMP) /** @see _Scheduler_Get_affinity() */ bool ( *get_affinity )( const Scheduler_Control *, @@ -523,7 +523,7 @@ void _Scheduler_default_Start_idle( struct Per_CPU_Control *cpu ); -#if defined(__RTEMS_HAVE_SYS_CPUSET_H__) && defined(RTEMS_SMP) +#if defined(RTEMS_SMP) /** * @brief Get affinity for the default scheduler. * diff --git a/cpukit/score/include/rtems/score/schedulerimpl.h b/cpukit/score/include/rtems/score/schedulerimpl.h index 737d1a35ab..90a9bcca68 100644 --- a/cpukit/score/include/rtems/score/schedulerimpl.h +++ b/cpukit/score/include/rtems/score/schedulerimpl.h @@ -659,8 +659,6 @@ RTEMS_INLINE_ROUTINE bool _Scheduler_Has_processor_ownership( #endif } -#if defined(__RTEMS_HAVE_SYS_CPUSET_H__) - RTEMS_INLINE_ROUTINE void _Scheduler_Get_processor_set( const Scheduler_Control *scheduler, size_t cpusetsize, @@ -744,8 +742,6 @@ bool _Scheduler_Set_affinity( const cpu_set_t *cpuset ); -#endif /* defined(__RTEMS_HAVE_SYS_CPUSET_H__) */ - RTEMS_INLINE_ROUTINE void _Scheduler_Generic_block( const Scheduler_Control *scheduler, Thread_Control *the_thread, diff --git a/cpukit/score/src/cpuset.c b/cpukit/score/src/cpuset.c index 3247582ed4..1540d3c83c 100644 --- a/cpukit/score/src/cpuset.c +++ b/cpukit/score/src/cpuset.c @@ -19,7 +19,6 @@ #include "config.h" #endif -#ifdef __RTEMS_HAVE_SYS_CPUSET_H__ #include <sys/cpuset.h> #include <rtems/sysinit.h> #include <rtems/score/cpusetimpl.h> @@ -96,6 +95,3 @@ const CPU_set_Control *_CPU_set_Default() { return &cpuset_default; } -#endif - - diff --git a/cpukit/score/src/cpusetprintsupport.c b/cpukit/score/src/cpusetprintsupport.c index 13cffd9242..c1ae235786 100644 --- a/cpukit/score/src/cpusetprintsupport.c +++ b/cpukit/score/src/cpusetprintsupport.c @@ -26,55 +26,52 @@ #include <rtems/printer.h> #include <rtems/score/cpusetimpl.h> -#ifdef __RTEMS_HAVE_SYS_CPUSET_H__ +void _CPU_set_Show_with_plugin( + const rtems_printer *printer, + const char *description, + const cpu_set_t *cpuset +); - void _CPU_set_Show_with_plugin( - const rtems_printer *printer, - const char *description, - const cpu_set_t *cpuset - ); - - /* - * _CPU_set_Show_with_plugin - * - * This routine shows cpuset cpuset using a - * print plugin . - */ - void _CPU_set_Show_with_plugin( - const rtems_printer *printer, - const char *description, - const cpu_set_t *cpuset - ) - { - int i; - rtems_printf(printer ,"%s: ", description); - for(i=0; i<_NCPUWORDS; i++) - rtems_printf(printer ,"%" PRIx32 "", cpuset->__bits[i]); - rtems_printf(printer ,"\n"); - } +/* + * _CPU_set_Show_with_plugin + * + * This routine shows cpuset cpuset using a + * print plugin . + */ +void _CPU_set_Show_with_plugin( + const rtems_printer *printer, + const char *description, + const cpu_set_t *cpuset +) +{ + int i; + rtems_printf(printer ,"%s: ", description); + for(i=0; i<_NCPUWORDS; i++) + rtems_printf(printer ,"%" PRIx32 "", cpuset->__bits[i]); + rtems_printf(printer ,"\n"); +} - /* - * _CPU_set_Show - * - * This routine shows a cpuset using the - * printk plugin. - */ - void _CPU_set_Show( const char *description, const cpu_set_t *cpuset) - { - rtems_printer printer; - rtems_print_printer_printk( &printer ); - _CPU_set_Show_with_plugin( &printer, description, cpuset ); - } +/* + * _CPU_set_Show + * + * This routine shows a cpuset using the + * printk plugin. + */ +void _CPU_set_Show( const char *description, const cpu_set_t *cpuset) +{ + rtems_printer printer; + rtems_print_printer_printk( &printer ); + _CPU_set_Show_with_plugin( &printer, description, cpuset ); +} - /* - * _CPU_set_Show_default - * - * This routine shows the default cpuset. - */ - void _CPU_set_Show_default( const char *description ) - { - const CPU_set_Control *ctl; - ctl = _CPU_set_Default(); - _CPU_set_Show( description, ctl->set ); - } -#endif +/* + * _CPU_set_Show_default + * + * This routine shows the default cpuset. + */ +void _CPU_set_Show_default( const char *description ) +{ + const CPU_set_Control *ctl; + ctl = _CPU_set_Default(); + _CPU_set_Show( description, ctl->set ); +} diff --git a/cpukit/score/src/schedulergetaffinity.c b/cpukit/score/src/schedulergetaffinity.c index 84899574b9..37e10de958 100644 --- a/cpukit/score/src/schedulergetaffinity.c +++ b/cpukit/score/src/schedulergetaffinity.c @@ -18,8 +18,6 @@ #include <rtems/score/schedulerimpl.h> -#if defined(__RTEMS_HAVE_SYS_CPUSET_H__) - bool _Scheduler_Get_affinity( Thread_Control *the_thread, size_t cpusetsize, @@ -56,5 +54,3 @@ bool _Scheduler_Get_affinity( _Scheduler_Release_critical( scheduler, &lock_context ); return ok; } - -#endif /* defined(__RTEMS_HAVE_SYS_CPUSET_H__) */ diff --git a/cpukit/score/src/schedulersetaffinity.c b/cpukit/score/src/schedulersetaffinity.c index 6635ffa85f..67073dffd1 100644 --- a/cpukit/score/src/schedulersetaffinity.c +++ b/cpukit/score/src/schedulersetaffinity.c @@ -18,8 +18,6 @@ #include <rtems/score/schedulerimpl.h> -#if defined(__RTEMS_HAVE_SYS_CPUSET_H__) - bool _Scheduler_Set_affinity( Thread_Control *the_thread, size_t cpusetsize, @@ -56,5 +54,3 @@ bool _Scheduler_Set_affinity( _Scheduler_Release_critical( scheduler, &lock_context ); return ok; } - -#endif /* defined(__RTEMS_HAVE_SYS_CPUSET_H__) */ |