summaryrefslogtreecommitdiffstats
path: root/cpukit/posix/src
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2021-03-12 08:31:35 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2021-03-16 12:48:37 +0100
commitc9a41b0043e67ed7f1be98f19b5f5fda994ceb55 (patch)
tree20a3eca7fab35a9f4e802d3fe3c01a57c8ca13b1 /cpukit/posix/src
parentvalidation: Task create/construct (diff)
downloadrtems-c9a41b0043e67ed7f1be98f19b5f5fda994ceb55.tar.bz2
score: Add Thread_Configuration::cpu_time_budget
Move the CPU time budget to the thread configuration. This simplifies _Thread_Initialize().
Diffstat (limited to 'cpukit/posix/src')
-rw-r--r--cpukit/posix/src/psxtransschedparam.c23
-rw-r--r--cpukit/posix/src/pthreadcreate.c3
-rw-r--r--cpukit/posix/src/pthreadsetschedparam.c44
3 files changed, 30 insertions, 40 deletions
diff --git a/cpukit/posix/src/psxtransschedparam.c b/cpukit/posix/src/psxtransschedparam.c
index 6fa7a43886..eba26d4932 100644
--- a/cpukit/posix/src/psxtransschedparam.c
+++ b/cpukit/posix/src/psxtransschedparam.c
@@ -42,27 +42,28 @@ int _POSIX_Thread_Translate_to_sched_policy(
}
int _POSIX_Thread_Translate_sched_param(
- int policy,
- const struct sched_param *param,
- Thread_CPU_budget_algorithms *budget_algorithm,
- Thread_CPU_budget_algorithm_callout *budget_callout
+ int policy,
+ const struct sched_param *param,
+ Thread_Configuration *config
)
{
- *budget_algorithm = THREAD_CPU_BUDGET_ALGORITHM_NONE;
- *budget_callout = NULL;
+ config->budget_algorithm = THREAD_CPU_BUDGET_ALGORITHM_NONE;
+ config->budget_callout = NULL;
+ config->cpu_time_budget = 0;
if ( policy == SCHED_OTHER ) {
- *budget_algorithm = THREAD_CPU_BUDGET_ALGORITHM_RESET_TIMESLICE;
+ config->budget_algorithm = THREAD_CPU_BUDGET_ALGORITHM_RESET_TIMESLICE;
return 0;
}
if ( policy == SCHED_FIFO ) {
- *budget_algorithm = THREAD_CPU_BUDGET_ALGORITHM_NONE;
+ config->budget_algorithm = THREAD_CPU_BUDGET_ALGORITHM_NONE;
return 0;
}
if ( policy == SCHED_RR ) {
- *budget_algorithm = THREAD_CPU_BUDGET_ALGORITHM_EXHAUST_TIMESLICE;
+ config->budget_algorithm = THREAD_CPU_BUDGET_ALGORITHM_EXHAUST_TIMESLICE;
+ config->cpu_time_budget = rtems_configuration_get_ticks_per_timeslice();
return 0;
}
@@ -80,8 +81,8 @@ int _POSIX_Thread_Translate_sched_param(
_Timespec_To_ticks( &param->sched_ss_init_budget ) )
return EINVAL;
- *budget_algorithm = THREAD_CPU_BUDGET_ALGORITHM_CALLOUT;
- *budget_callout = _POSIX_Threads_Sporadic_budget_callout;
+ config->budget_algorithm = THREAD_CPU_BUDGET_ALGORITHM_CALLOUT;
+ config->budget_callout = _POSIX_Threads_Sporadic_budget_callout;
return 0;
}
#endif
diff --git a/cpukit/posix/src/pthreadcreate.c b/cpukit/posix/src/pthreadcreate.c
index 55ba73c8b4..75d3c64676 100644
--- a/cpukit/posix/src/pthreadcreate.c
+++ b/cpukit/posix/src/pthreadcreate.c
@@ -171,8 +171,7 @@ int pthread_create(
error = _POSIX_Thread_Translate_sched_param(
schedpolicy,
&schedparam,
- &config.budget_algorithm,
- &config.budget_callout
+ &config
);
if ( error != 0 ) {
return error;
diff --git a/cpukit/posix/src/pthreadsetschedparam.c b/cpukit/posix/src/pthreadsetschedparam.c
index 9ab543cd31..e9be24b417 100644
--- a/cpukit/posix/src/pthreadsetschedparam.c
+++ b/cpukit/posix/src/pthreadsetschedparam.c
@@ -24,6 +24,7 @@
#endif
#include <pthread.h>
+#include <string.h>
#include <errno.h>
#include <rtems/posix/pthreadimpl.h>
@@ -32,12 +33,11 @@
#include <rtems/score/schedulerimpl.h>
static int _POSIX_Set_sched_param(
- Thread_Control *the_thread,
- int policy,
- const struct sched_param *param,
- Thread_CPU_budget_algorithms budget_algorithm,
- Thread_CPU_budget_algorithm_callout budget_callout,
- Thread_queue_Context *queue_context
+ Thread_Control *the_thread,
+ int policy,
+ const struct sched_param *param,
+ const Thread_Configuration *config,
+ Thread_queue_Context *queue_context
)
{
const Scheduler_Control *scheduler;
@@ -103,8 +103,9 @@ static int _POSIX_Set_sched_param(
}
#endif
- the_thread->budget_algorithm = budget_algorithm;
- the_thread->budget_callout = budget_callout;
+ the_thread->cpu_time_budget = config->cpu_time_budget;
+ the_thread->budget_algorithm = config->budget_algorithm;
+ the_thread->budget_callout = config->budget_callout;
#if defined(RTEMS_POSIX_API)
_Priority_Node_set_priority( &api->Sporadic.Low_priority, core_low_prio );
@@ -114,11 +115,6 @@ static int _POSIX_Set_sched_param(
if ( policy == SCHED_SPORADIC ) {
_POSIX_Threads_Sporadic_timer_insert( the_thread, api );
- } else {
-#endif
- the_thread->cpu_time_budget =
- rtems_configuration_get_ticks_per_timeslice();
-#if defined(RTEMS_POSIX_API)
}
#endif
@@ -135,23 +131,18 @@ int pthread_setschedparam(
#endif
)
{
- Thread_CPU_budget_algorithms budget_algorithm;
- Thread_CPU_budget_algorithm_callout budget_callout;
- Thread_Control *the_thread;
- Per_CPU_Control *cpu_self;
- Thread_queue_Context queue_context;
- int error;
+ Thread_Configuration config;
+ Thread_Control *the_thread;
+ Per_CPU_Control *cpu_self;
+ Thread_queue_Context queue_context;
+ int error;
if ( param == NULL ) {
return EINVAL;
}
- error = _POSIX_Thread_Translate_sched_param(
- policy,
- param,
- &budget_algorithm,
- &budget_callout
- );
+ memset( &config, 0, sizeof( config ) );
+ error = _POSIX_Thread_Translate_sched_param( policy, param, &config );
if ( error != 0 ) {
return error;
}
@@ -169,8 +160,7 @@ int pthread_setschedparam(
the_thread,
policy,
param,
- budget_algorithm,
- budget_callout,
+ &config,
&queue_context
);
cpu_self = _Thread_queue_Dispatch_disable( &queue_context );