Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-05 23:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

rtems: Change rtems_task_get_affinity() status

Browse Source 
In case the processor set is not large enough to contain the processor
affinity set of the task return RTEMS_INVALID_SIZE instead of
RTEMS_INVALID_NUMBER. This is more in line with other directives since
the issue is related to the size of an object.

Close #4393.
This commit is contained in:
Sebastian Huber
2021-04-26 11:00:24 +02:00
parent 127a812f50
commit 4b7c77bce3
5 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cpukit/include/rtems/score/schedulerimpl.h
View File

@@ -695,7 +695,7 @@ RTEMS_INLINE_ROUTINE const Processor_mask *_Scheduler_Get_processors(
* *
* @retval STATUS_SUCCESSFUL The operation succeeded. * @retval STATUS_SUCCESSFUL The operation succeeded.
* *
* @retval STATUS_INVALID_NUMBER The processor set was too small. * @retval STATUS_INVALID_SIZE The processor set was too small.
*/ */
Status_Control _Scheduler_Get_affinity( Status_Control _Scheduler_Get_affinity(
Thread_Control *the_thread, Thread_Control *the_thread,

2
cpukit/include/rtems/score/status.h
View File

@@ -118,6 +118,8 @@ typedef enum {
STATUS_BUILD( STATUS_CLASSIC_INVALID_NUMBER, EINVAL ), STATUS_BUILD( STATUS_CLASSIC_INVALID_NUMBER, EINVAL ),
STATUS_INVALID_PRIORITY = STATUS_INVALID_PRIORITY =
STATUS_BUILD( STATUS_CLASSIC_INVALID_PRIORITY, EINVAL ), STATUS_BUILD( STATUS_CLASSIC_INVALID_PRIORITY, EINVAL ),
STATUS_INVALID_SIZE =
STATUS_BUILD( STATUS_CLASSIC_INVALID_SIZE, EINVAL ),
STATUS_MAXIMUM_COUNT_EXCEEDED = STATUS_MAXIMUM_COUNT_EXCEEDED =
STATUS_BUILD( STATUS_CLASSIC_UNSATISFIED, EOVERFLOW ), STATUS_BUILD( STATUS_CLASSIC_UNSATISFIED, EOVERFLOW ),
STATUS_MESSAGE_INVALID_SIZE = STATUS_MESSAGE_INVALID_SIZE =

2
cpukit/score/src/schedulergetaffinity.c
View File

@@ -51,7 +51,7 @@ Status_Control _Scheduler_Get_affinity(
_Scheduler_Release_critical( scheduler, &lock_context ); _Scheduler_Release_critical( scheduler, &lock_context );
if ( status != PROCESSOR_MASK_COPY_LOSSLESS ) { if ( status != PROCESSOR_MASK_COPY_LOSSLESS ) {
return STATUS_INVALID_NUMBER; return STATUS_INVALID_SIZE;
} }
return STATUS_SUCCESSFUL; return STATUS_SUCCESSFUL;

2
testsuites/smptests/smpaffinity01/init.c
View File

@@ -85,7 +85,7 @@ void Validate_getaffinity_errors(void)
"Init - rtems_task_get_affinity - Invalid cpusetsize - RTEMS_INVALID_NUMBER" "Init - rtems_task_get_affinity - Invalid cpusetsize - RTEMS_INVALID_NUMBER"
); );
sc = rtems_task_get_affinity( Init_id, 1, &cpuset ); sc = rtems_task_get_affinity( Init_id, 1, &cpuset );
rtems_test_assert( sc == RTEMS_INVALID_NUMBER ); rtems_test_assert( sc == RTEMS_INVALID_SIZE );
/* Verify rtems_task_get_affinity validates cpuset */ /* Verify rtems_task_get_affinity validates cpuset */
puts("Init - rtems_task_get_affinity - Invalid cpuset - RTEMS_INVALID_ADDRESS"); puts("Init - rtems_task_get_affinity - Invalid cpuset - RTEMS_INVALID_ADDRESS");

3
testsuites/sptests/spscheduler01/init.c
View File

@@ -49,6 +49,7 @@ static void assert_eno(rtems_status_code sc, int eno)
rtems_test_assert(eno == ESRCH); rtems_test_assert(eno == ESRCH);
break; break;
case RTEMS_INVALID_NUMBER: case RTEMS_INVALID_NUMBER:
case RTEMS_INVALID_SIZE:
rtems_test_assert(eno == EINVAL); rtems_test_assert(eno == EINVAL);
break; break;
default: default:
@@ -139,7 +140,7 @@ static void test_task_get_set_affinity(void)
rtems_test_assert(sc == RTEMS_INVALID_ADDRESS); rtems_test_assert(sc == RTEMS_INVALID_ADDRESS);
sc = task_get_affinity(RTEMS_SELF, 0, &cpuset); sc = task_get_affinity(RTEMS_SELF, 0, &cpuset);
rtems_test_assert(sc == RTEMS_INVALID_NUMBER); rtems_test_assert(sc == RTEMS_INVALID_SIZE);
sc = task_set_affinity(RTEMS_SELF, 0, &cpuset); sc = task_set_affinity(RTEMS_SELF, 0, &cpuset);
rtems_test_assert(sc == RTEMS_INVALID_NUMBER); rtems_test_assert(sc == RTEMS_INVALID_NUMBER);