Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 783 → Rev 782

/shark/trunk/ports/first/modules/posixstar.c
313,7 → 313,7
}
 
static void POSIXSTAR_public_activate(LEVEL l, PID p, struct timespec *t)
static void POSIXSTAR_public_activate(LEVEL l, PID p)
{
POSIXSTAR_level_des *lev = (POSIXSTAR_level_des *)(level_table[l]);
 
/shark/trunk/ports/first/modules/rmstar.c
43,8 → 43,6
#include <kernel/var.h>
#include <kernel/func.h>
 
#include <tracer.h>
 
#define RMSTAR_CHANGE_LEVEL 1
 
/* for iqueues */
204,8 → 202,6
#endif
/* else, a deadline miss occurred!!! */
lev->dline_miss[p]++;
TRACER_LOGEVENT(FTrace_EVT_task_deadline_miss,proc_table[p].context,proc_table[p].task_level);
 
if (!(lev->flag[p] & RMSTAR_FLAG_SPORADIC)) {
lev->nact[p]++;
ADDUSEC2TIMESPEC(lev->period[p], &lev->deadline_timespec[p]);
337,7 → 333,6
rmstar_printf2("W%d",p);
#endif
//proc_table[p].control &= ~CONTROL_CAP;
TRACER_LOGEVENT(FTrace_EVT_task_wcet_violation,proc_table[p].context,proc_table[p].task_level);
lev->wcet_miss[p]++;
}
#ifdef RMSTAR_DEBUG
352,7 → 347,7
level_table[proc_table[exec].task_level]->public_epilogue(proc_table[exec].task_level,p);
}
 
static void RMSTAR_public_activate(LEVEL l, PID p, struct timespec *o)
static void RMSTAR_public_activate(LEVEL l, PID p)
{
RMSTAR_level_des *lev = (RMSTAR_level_des *)(level_table[l]);
struct timespec t;
488,7 → 483,7
#ifdef RMSTAR_DEBUG
rmstar_printf(")");
#endif
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,proc_table[p].context,proc_table[p].task_level);
jet_update_endcycle(); /* Update the Jet data... */
break;
default:
/shark/trunk/ports/first/modules/edfstar.c
43,7 → 43,6
#include <kernel/var.h>
#include <kernel/func.h>
 
#include <tracer.h>
 
#define EDFSTAR_CHANGE_LEVEL 1
 
200,7 → 199,6
#endif
/* else, a deadline miss occurred!!! */
lev->dline_miss[p]++;
TRACER_LOGEVENT(FTrace_EVT_task_deadline_miss,proc_table[p].context,proc_table[p].task_level);
 
/* the task is into another state */
if (!(lev->flag[p] & EDFSTAR_FLAG_SPORADIC)) {
341,7 → 339,6
#endif
//proc_table[p].control &= ~CONTROL_CAP;
lev->wcet_miss[exec]++;
TRACER_LOGEVENT(FTrace_EVT_task_wcet_violation,proc_table[p].context,proc_table[p].task_level);
}
 
#ifdef EDFSTAR_DEBUG
357,7 → 354,7
 
}
 
static void EDFSTAR_public_activate(LEVEL l, PID p, struct timespec *o)
static void EDFSTAR_public_activate(LEVEL l, PID p)
{
EDFSTAR_level_des *lev = (EDFSTAR_level_des *)(level_table[l]);
struct timespec t;
473,7 → 470,7
lev->dline_miss[p]++;
kern_event_delete(lev->deadline_timer[p]);
}
 
} else {
 
#ifdef EDFSTAR_DEBUG
496,8 → 493,7
#ifdef EDFSTAR_DEBUG
edfstar_printf(")");
#endif
 
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,proc_table[p].context,proc_table[p].task_level);
jet_update_endcycle(); /* Update the Jet data... */
break;