<p dir="ltr"><br>
On Jun 2, 2014 3:08 AM, Sebastian Huber <sebh@rtems.org> wrote:<br>
><br>
> Module: rtems<br>
> Branch: master<br>
> Commit: 25f5730fe515911e42591f66294baff0369d9883<br>
> Changeset: http://git.rtems.org/rtems/commit/?id=25f5730fe515911e42591f66294baff0369d9883<br>
><br>
> Author: Sebastian Huber <sebastian.huber@embedded-brains.de><br>
> Date: Wed May 28 18:11:51 2014 +0200<br>
><br>
> score: _Scheduler_Set_affinity()<br>
><br>
> Do not change the scheduler with this function. Documentation. Coding<br>
> style.<br>
><br>
> ---<br>
><br>
> cpukit/rtems/include/rtems/rtems/tasks.h | 11 +++++<br>
> cpukit/score/include/rtems/score/schedulerimpl.h | 10 +----<br>
> cpukit/score/src/schedulersetaffinity.c | 52 +++++++---------------<br>
> doc/user/smp.t | 10 ++++-<br>
> testsuites/smptests/smpscheduler02/init.c | 6 +-<br>
> 5 files changed, 41 insertions(+), 48 deletions(-)<br>
><br>
> diff --git a/cpukit/rtems/include/rtems/rtems/tasks.h b/cpukit/rtems/include/rtems/rtems/tasks.h<br>
> index 76653fd..e0fa27e 100644<br>
> --- a/cpukit/rtems/include/rtems/rtems/tasks.h<br>
> +++ b/cpukit/rtems/include/rtems/rtems/tasks.h<br>
> @@ -521,6 +521,17 @@ rtems_status_code rtems_task_get_affinity(<br>
> /**<br>
> * @brief Sets the processor affinity set of a task.<br>
> *<br>
> + * This function will not change the scheduler of the task. The intersection<br>
> + * of the processor affinity set and the set of processors owned by the<br>
> + * scheduler of the task must be non-empty. It is not an error if the<br>
> + * processor affinity set contains processors that are not part of the set of<br>
> + * processors owned by the scheduler instance of the task. A task will simply<br>
> + * not run under normal circumstances on these processors since the scheduler<br>
> + * ignores them. Some locking protocols may temporarily use processors that<br>
> + * are not included in the processor affinity set of the task. It is also not<br>
> + * an error if the processor affinity set contains processors that are not part<br>
> + * of the system.<br>
> + *<br>
> * @param[in] id Identifier of the task. Use @ref RTEMS_SELF to select the<br>
> * executing task.<br>
> * @param[in] cpusetsize Size of the specified affinity set buffer in<br>
> diff --git a/cpukit/score/include/rtems/score/schedulerimpl.h b/cpukit/score/include/rtems/score/schedulerimpl.h<br>
> index a434c8c..f1acf32 100644<br>
> --- a/cpukit/score/include/rtems/score/schedulerimpl.h<br>
> +++ b/cpukit/score/include/rtems/score/schedulerimpl.h<br>
> @@ -418,7 +418,6 @@ RTEMS_INLINE_ROUTINE bool _Scheduler_default_Set_affinity_body(<br>
> const cpu_set_t *cpuset<br>
> )<br>
> {<br>
> - size_t cpu_max = _CPU_set_Maximum_CPU_count( cpusetsize );<br>
> uint32_t cpu_count = _SMP_Get_processor_count();<br>
> uint32_t cpu_index;<br>
> bool ok = true;<br>
> @@ -429,8 +428,7 @@ RTEMS_INLINE_ROUTINE bool _Scheduler_default_Set_affinity_body(<br>
> _Scheduler_Get_by_CPU_index( cpu_index );<br>
> <br>
> ok = ok<br>
> - && ( ( CPU_ISSET_S( (int) cpu_index, cpusetsize, cpuset )<br>
> - && scheduler == scheduler_of_cpu )<br>
> + && ( CPU_ISSET_S( (int) cpu_index, cpusetsize, cpuset )<br>
> || ( !CPU_ISSET_S( (int) cpu_index, cpusetsize, cpuset )<br>
> && scheduler != scheduler_of_cpu ) );</p>
<p dir="ltr">If we need kept the affinity of each thread in a common place like thread control or scheduler base node when SMP is enabled and the scheduler's set of managed CPUs in the base info for all schedulers when SMP is enabled, then you would always have CPU sets which could be simply Anded, Ored, etc.</p>
<p dir="ltr">This would simplify this logic from a loop to a simply logic expression.</p>
<p dir="ltr">> #else<br>
> @@ -440,12 +438,6 @@ RTEMS_INLINE_ROUTINE bool _Scheduler_default_Set_affinity_body(<br>
> #endif<br>
> }<br>
> <br>
> - for ( ; cpu_index < cpu_max ; ++cpu_index ) {<br>
> - ok = ok && !CPU_ISSET_S( (int) cpu_index, cpusetsize, cpuset );<br>
> - }<br>
> -<br>
> - _Scheduler_Set( scheduler, the_thread );<br>
> -<br>
> return ok;<br>
> }<br>
> <br>
> diff --git a/cpukit/score/src/schedulersetaffinity.c b/cpukit/score/src/schedulersetaffinity.c<br>
> index a20888b..f7c9336 100644<br>
> --- a/cpukit/score/src/schedulersetaffinity.c<br>
> +++ b/cpukit/score/src/schedulersetaffinity.c<br>
> @@ -26,45 +26,27 @@ bool _Scheduler_Set_affinity(<br>
> const cpu_set_t *cpuset<br>
> )<br>
> {<br>
> - bool ok;<br>
> + const Scheduler_Control *scheduler = _Scheduler_Get( the_thread );<br>
> <br>
> - if ( _CPU_set_Is_large_enough( cpusetsize ) ) {<br>
> -#if defined(RTEMS_SMP)<br>
> - uint32_t cpu_count = _SMP_Get_processor_count();<br>
> - uint32_t cpu_index;<br>
> -<br>
> - ok = false;<br>
> -<br>
> - for ( cpu_index = 0 ; cpu_index < cpu_count ; ++cpu_index ) {<br>
> - if ( CPU_ISSET_S( (int) cpu_index, cpusetsize, cpuset ) ) {<br>
> - const Scheduler_Control *scheduler_of_cpu =<br>
> - _Scheduler_Get_by_CPU_index( cpu_index );<br>
> -<br>
> - if ( scheduler_of_cpu != NULL ) {<br>
> - ok = ( *scheduler_of_cpu->Operations.set_affinity )(<br>
> - scheduler_of_cpu,<br>
> - the_thread,<br>
> - cpusetsize,<br>
> - cpuset<br>
> - );<br>
> - }<br>
> + if ( !_CPU_set_Is_large_enough( cpusetsize ) ) {<br>
> + return false;<br>
> + }<br>
> <br>
> - break;<br>
> - }<br>
> - }<br>
> +#if defined(RTEMS_SMP)<br>
> + return ( *scheduler->Operations.set_affinity )(<br>
> + scheduler,<br>
> + the_thread,<br>
> + cpusetsize,<br>
> + cpuset<br>
> + );<br>
> #else<br>
> - ok = _Scheduler_default_Set_affinity_body(<br>
> - _Scheduler_Get( the_thread ),<br>
> - the_thread,<br>
> - cpusetsize,<br>
> - cpuset<br>
> - );<br>
> + return _Scheduler_default_Set_affinity_body(<br>
> + scheduler,<br>
> + the_thread,<br>
> + cpusetsize,<br>
> + cpuset<br>
> + );<br>
> #endif<br>
> - } else {<br>
> - ok = false;<br>
> - }<br>
> -<br>
> - return ok;<br>
> }<br>
> <br>
> #endif /* defined(__RTEMS_HAVE_SYS_CPUSET_H__) */<br>
> diff --git a/doc/user/smp.t b/doc/user/smp.t<br>
> index a040b70..dd84c37 100644<br>
> --- a/doc/user/smp.t<br>
> +++ b/doc/user/smp.t<br>
> @@ -622,4 +622,12 @@ cleared bit means the opposite.<br>
> <br>
> @subheading NOTES:<br>
> <br>
> -None.<br>
> +This function will not change the scheduler of the task. The intersection of<br>
> +the processor affinity set and the set of processors owned by the scheduler of<br>
> +the task must be non-empty. It is not an error if the processor affinity set<br>
> +contains processors that are not part of the set of processors owned by the<br>
> +scheduler instance of the task. A task will simply not run under normal<br>
> +circumstances on these processors since the scheduler ignores them. Some<br>
> +locking protocols may temporarily use processors that are not included in the<br>
> +processor affinity set of the task. It is also not an error if the processor<br>
> +affinity set contains processors that are not part of the system.<br>
> diff --git a/testsuites/smptests/smpscheduler02/init.c b/testsuites/smptests/smpscheduler02/init.c<br>
> index 5bfff0e..9ae636c 100644<br>
> --- a/testsuites/smptests/smpscheduler02/init.c<br>
> +++ b/testsuites/smptests/smpscheduler02/init.c<br>
> @@ -139,14 +139,14 @@ static void test(void)<br>
> rtems_test_assert(CPU_EQUAL(&cpuset, &second_cpu));<br>
> <br>
> sc = rtems_task_set_affinity(task_id, sizeof(all_cpus), &all_cpus);<br>
> - rtems_test_assert(sc == RTEMS_INVALID_NUMBER);<br>
> + rtems_test_assert(sc == RTEMS_SUCCESSFUL);<br>
> <br>
> sc = rtems_task_set_affinity(task_id, sizeof(first_cpu), &first_cpu);<br>
> - rtems_test_assert(sc == RTEMS_SUCCESSFUL);<br>
> + rtems_test_assert(sc == RTEMS_INVALID_NUMBER);<br>
> <br>
> sc = rtems_task_get_scheduler(task_id, &scheduler_id);<br>
> rtems_test_assert(sc == RTEMS_SUCCESSFUL);<br>
> - rtems_test_assert(scheduler_id == scheduler_a_id);<br>
> + rtems_test_assert(scheduler_id == scheduler_b_id);<br>
> <br>
> sc = rtems_task_set_affinity(task_id, sizeof(second_cpu), &second_cpu);<br>
> rtems_test_assert(sc == RTEMS_SUCCESSFUL);<br>
><br>
> _______________________________________________<br>
> rtems-vc mailing list<br>
> rtems-vc@rtems.org<br>
> http://www.rtems.org/mailman/listinfo/rtems-vc<br>
</p>