18,11 → 18,11 |
|
/** |
------------ |
CVS : $Id: edfstar.c,v 1.2 2003-09-11 13:51:33 giacomo Exp $ |
CVS : $Id: edfstar.c,v 1.3 2003-09-11 15:42:01 giacomo Exp $ |
|
File: $File$ |
Revision: $Revision: 1.2 $ |
Last update: $Date: 2003-09-11 13:51:33 $ |
Revision: $Revision: 1.3 $ |
Last update: $Date: 2003-09-11 15:42:01 $ |
------------ |
**/ |
|
300,7 → 300,7 |
private_dispatch(lev->scheduling_level,p,nostop); |
} |
|
static int EDFSTAR_change_level(LEVEL l, PID p) |
static int EDFSTAR_private_change_level(LEVEL l, PID p) |
{ |
|
EDFSTAR_level_des *lev = (EDFSTAR_level_des *)(level_table[l]); |
307,12 → 307,19 |
|
/* Change task level */ |
if (lev->flag[p] & EDFSTAR_CHANGE_LEVEL) { |
|
STD_command_message msg; |
|
proc_table[p].status = SLEEP; |
|
level_table[lev->scheduling_level]->private_extract(lev->scheduling_level,p); |
iq_extract(p,&lev->ready); |
|
if (lev->deadline_timer[p] != -1) |
kern_event_delete(lev->deadline_timer[p]); |
|
EDFSTAR_check_preemption(lev); |
|
lev->nact[p] = 0; |
lev->budget[p] = -1; |
proc_table[p].task_level = lev->new_level[p]; |
340,7 → 347,7 |
edfstar_printf("(E:epi "); |
#endif |
|
if (EDFSTAR_change_level(l, p)) return; |
if (EDFSTAR_private_change_level(l, p)) return; |
|
/* check if the wcet is finished... */ |
if (proc_table[p].avail_time <= 0 && proc_table[p].control&CONTROL_CAP) { |
437,6 → 444,8 |
/* Task EndCycle */ |
case (long)(NULL): |
|
if (EDFSTAR_private_change_level(l,p)) return 0; |
|
/* we call guest_end directly here because the same task may |
be reinserted in the queue before calling the preemption check! */ |
level_table[ lev->scheduling_level ]-> |
448,25 → 457,6 |
/* we reset the capacity counters... */ |
proc_table[p].avail_time = proc_table[p].wcet; |
|
if (lev->flag[p] & EDFSTAR_CHANGE_LEVEL) { |
STD_command_message msg; |
|
lev->nact[p] = 0; |
|
lev->budget[p] = -1; |
proc_table[p].task_level = lev->new_level[p]; |
|
/* Send change level command to local scheduler */ |
|
msg.command = STD_ACTIVATE_TASK; |
msg.param = NULL; |
|
level_table[ lev->new_level[p] ]->public_message(lev->new_level[p],p,&msg); |
|
return 0; |
|
} |
|
if (lev->nact[p] > 0) { |
|
#ifdef EDFSTAR_DEBUG |
515,7 → 505,11 |
default: |
|
msg = (STD_command_message *)m; |
|
|
#ifdef EDFSTAR_DEBUG |
edfstar_printf("(E:MSG %d)",msg->command); |
#endif |
|
switch(msg->command) { |
case STD_SET_NEW_MODEL: |
/* if the EDFSTAR_task_create is called, then the pclass must be a |
523,7 → 517,7 |
h=(HARD_TASK_MODEL *)(msg->param); |
|
/* now we know that m is a valid model */ |
lev->wcet[p]=h->wcet; |
lev->wcet[p] = h->wcet; |
lev->period[p] = h->mit; |
|
lev->flag[p] = 0; |
547,6 → 541,7 |
proc_table[p].avail_time = lev->wcet[p]; |
proc_table[p].wcet = lev->wcet[p]; |
proc_table[p].control |= CONTROL_CAP; |
|
EDFSTAR_public_activate(l, p); |
|
break; |