Changeset 7ec66e08 in rtems


Ignore:
Timestamp:
Jun 16, 2016, 3:23:16 PM (3 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
9a78f8a5
Parents:
77ff5599
git-author:
Sebastian Huber <sebastian.huber@…> (06/16/16 15:23:16)
git-committer:
Sebastian Huber <sebastian.huber@…> (06/22/16 12:37:10)
Message:

score: Remove hidden deadline overrule for CBS

Do what the user commands. Maybe we should add a rtems_cbs_period()
that calls rtems_rate_monotonic_period() with the right parameter.

Update #2173.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • cpukit/score/src/schedulercbsreleasejob.c

    r77ff5599 r7ec66e08  
    2121
    2222#include <rtems/score/schedulercbsimpl.h>
    23 #include <rtems/score/threadimpl.h>
    24 #include <rtems/score/watchdogimpl.h>
    2523
    2624void _Scheduler_CBS_Release_job(
     
    3028)
    3129{
    32   Scheduler_CBS_Node   *node = _Scheduler_CBS_Thread_get_node( the_thread );
    33   Scheduler_CBS_Server *serv_info = node->cbs_server;
    34   Priority_Control      new_priority;
    35   Priority_Control      unused;
     30  Scheduler_CBS_Node   *node;
     31  Scheduler_CBS_Server *serv_info;
    3632
    37   if (deadline) {
    38     /* Initializing or shifting deadline. */
    39     if (serv_info)
    40       new_priority = (_Watchdog_Ticks_since_boot + serv_info->parameters.deadline)
    41         & ~SCHEDULER_EDF_PRIO_MSB;
    42     else
    43       new_priority = (_Watchdog_Ticks_since_boot + deadline)
    44         & ~SCHEDULER_EDF_PRIO_MSB;
    45   }
    46   else {
    47     /* Switch back to background priority. */
    48     new_priority = the_thread->Start.initial_priority;
    49   }
     33  _Scheduler_EDF_Release_job( scheduler, the_thread, deadline );
     34
     35  node = _Scheduler_CBS_Thread_get_node( the_thread );
     36  serv_info = node->cbs_server;
    5037
    5138  /* Budget replenishment for the next job. */
    52   if (serv_info)
     39  if ( serv_info != NULL ) {
    5340    the_thread->cpu_time_budget = serv_info->parameters.budget;
    54 
    55   _Thread_Set_priority( the_thread, new_priority, &unused, true );
     41  }
    5642}
Note: See TracChangeset for help on using the changeset viewer.