1 files changed, 44 insertions, 25 deletions

diff --git a/cpukit/posix/src/psxtransschedparam.c b/cpukit/posix/src/psxtransschedparam.c
index eba26d4932..211adc375b 100644
--- a/cpukit/posix/src/psxtransschedparam.c
+++ b/cpukit/posix/src/psxtransschedparam.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
 /**
  * @file
  *
@@ -10,9 +12,26 @@
  *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -23,22 +42,27 @@
 #include <errno.h>
 
 #include <rtems/posix/pthreadimpl.h>
+#include <rtems/score/threadcpubudget.h>
 
 int _POSIX_Thread_Translate_to_sched_policy(
-  Thread_CPU_budget_algorithms budget_algorithm
+  const Thread_CPU_budget_operations *operations
 )
 {
-  switch ( budget_algorithm ) {
-    case THREAD_CPU_BUDGET_ALGORITHM_RESET_TIMESLICE:
-      return SCHED_OTHER;
-    case THREAD_CPU_BUDGET_ALGORITHM_EXHAUST_TIMESLICE:
-      return SCHED_RR;
-    case THREAD_CPU_BUDGET_ALGORITHM_CALLOUT:
-      return SCHED_SPORADIC;
-    default:
-      _Assert( budget_algorithm == THREAD_CPU_BUDGET_ALGORITHM_NONE );
-      return SCHED_FIFO;
+  if ( operations == NULL ) {
+    return SCHED_FIFO;
+  }
+
+  if ( operations == &_Thread_CPU_budget_exhaust_timeslice ) {
+    return SCHED_RR;
+  }
+
+#if defined(RTEMS_POSIX_API)
+  if ( operations == &_POSIX_Threads_Sporadic_budget ) {
+    return SCHED_SPORADIC;
   }
+#endif
+
+  return SCHED_OTHER;
 }
 
 int _POSIX_Thread_Translate_sched_param(
@@ -47,23 +71,19 @@ int _POSIX_Thread_Translate_sched_param(
   Thread_Configuration     *config
 )
 {
-  config->budget_algorithm = THREAD_CPU_BUDGET_ALGORITHM_NONE;
-  config->budget_callout = NULL;
-  config->cpu_time_budget = 0;
+  config->cpu_budget_operations = NULL;
 
-  if ( policy == SCHED_OTHER ) {
-    config->budget_algorithm = THREAD_CPU_BUDGET_ALGORITHM_RESET_TIMESLICE;
+  if ( policy == SCHED_FIFO ) {
     return 0;
   }
 
-  if ( policy == SCHED_FIFO ) {
-    config->budget_algorithm = THREAD_CPU_BUDGET_ALGORITHM_NONE;
+  if ( policy == SCHED_OTHER ) {
+    config->cpu_budget_operations = &_Thread_CPU_budget_reset_timeslice;
     return 0;
   }
 
   if ( policy == SCHED_RR ) {
-    config->budget_algorithm = THREAD_CPU_BUDGET_ALGORITHM_EXHAUST_TIMESLICE;
-    config->cpu_time_budget = rtems_configuration_get_ticks_per_timeslice();
+    config->cpu_budget_operations = &_Thread_CPU_budget_exhaust_timeslice;
     return 0;
   }
 
@@ -81,8 +101,7 @@ int _POSIX_Thread_Translate_sched_param(
 	 _Timespec_To_ticks( &param->sched_ss_init_budget ) )
       return EINVAL;
 
-    config->budget_algorithm  = THREAD_CPU_BUDGET_ALGORITHM_CALLOUT;
-    config->budget_callout = _POSIX_Threads_Sporadic_budget_callout;
+    config->cpu_budget_operations = &_POSIX_Threads_Sporadic_budget;
     return 0;
   }
 #endif