Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 501 → Rev 502

/shark/trunk/kernel/modules/edf.c
20,11 → 20,11
 
/**
------------
CVS : $Id: edf.c,v 1.12 2004-02-10 17:50:04 giacomo Exp $
CVS : $Id: edf.c,v 1.13 2004-03-10 14:51:43 giacomo Exp $
 
File: $File$
Revision: $Revision: 1.12 $
Last update: $Date: 2004-02-10 17:50:04 $
Revision: $Revision: 1.13 $
Last update: $Date: 2004-03-10 14:51:43 $
------------
 
This file contains the scheduling module EDF (Earliest Deadline First)
123,7 → 123,7
 
case EDF_IDLE:
/* tracer stuff */
TRACER_LOGEVENT(FTrace_EVT_task_timer,3,proc_table[p].context,proc_table[p].task_level);
TRACER_LOGEVENT(FTrace_EVT_task_timer,(unsigned short int)proc_table[p].context,(unsigned int)proc_table[p].task_level);
/* similar to EDF_task_activate */
temp = iq_query_timespec(p,&lev->ready);
ADDUSEC2TIMESPEC(lev->period[p], temp);
146,7 → 146,7
 
default:
/* else, a deadline miss occurred!!! */
TRACER_LOGEVENT(FTrace_EVT_task_deadline_miss,1,proc_table[p].context,0);
TRACER_LOGEVENT(FTrace_EVT_task_deadline_miss,(unsigned short int)proc_table[p].context,0);
kern_raise(XDEADLINE_MISS,p);
}
}
158,7 → 158,7
#ifdef EDF_DEBUG
edf_printf("(EDF:AAARRRGGGHHH!!!)");
#endif
TRACER_LOGEVENT(FTrace_EVT_task_deadline_miss,1,proc_table[p].context,0);
TRACER_LOGEVENT(FTrace_EVT_task_deadline_miss,(unsigned short int)proc_table[p].context,0);
kern_raise(XDEADLINE_MISS,p);
}
 
270,7 → 270,7
/* check if the wcet is finished... */
if ((lev->flags & EDF_ENABLE_WCET_CHECK) && proc_table[p].avail_time <= 0) {
/* if it is, raise a XWCET_VIOLATION exception */
TRACER_LOGEVENT(FTrace_EVT_task_wcet_violation,1,proc_table[p].context,0);
TRACER_LOGEVENT(FTrace_EVT_task_wcet_violation,(unsigned short int)proc_table[p].context,0);
kern_raise(XWCET_VIOLATION,p);
proc_table[p].status = EDF_WCET_VIOLATED;
}
375,7 → 375,7
proc_table[p].avail_time = proc_table[p].wcet;
 
jet_update_endcycle(); /* Update the Jet data... */
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,3,proc_table[p].context,l);
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,(unsigned short int)proc_table[p].context,(unsigned int)l);
 
break;
 
394,7 → 394,7
if (proc_table[p].status == EDF_IDLE)
proc_table[p].status = EDF_WAIT;
 
TRACER_LOGEVENT(FTrace_EVT_task_disable,3,proc_table[p].context,l);
TRACER_LOGEVENT(FTrace_EVT_task_disable,(unsigned short int)proc_table[p].context,(unsigned int)l);
 
break;
 
/shark/trunk/kernel/modules/pc.c
20,11 → 20,11
 
/**
------------
CVS : $Id: pc.c,v 1.7 2004-01-08 20:10:41 giacomo Exp $
CVS : $Id: pc.c,v 1.8 2004-03-10 14:51:43 giacomo Exp $
 
File: $File$
Revision: $Revision: 1.7 $
Last update: $Date: 2004-01-08 20:10:41 $
Revision: $Revision: 1.8 $
Last update: $Date: 2004-03-10 14:51:43 $
------------
 
Priority Ceiling protocol. see pc.h for more details...
296,7 → 296,7
/* ... call the scheduler... */
scheduler();
//kern_printf("schedule: exec=%d, exec_shadow=%d\n",exec,exec_shadow);
TRACER_LOGEVENT(FTrace_EVT_inheritance,3,proc_table[exec_shadow].context,proc_table[exec].context);
TRACER_LOGEVENT(FTrace_EVT_inheritance,(unsigned short int)proc_table[exec_shadow].context,(unsigned int)proc_table[exec].context);
kern_context_load(proc_table[exec_shadow].context);
 
/* ... and reaquire the cli() before the test... */
407,7 → 407,7
}*/
 
scheduler();
TRACER_LOGEVENT(FTrace_EVT_inheritance,3,proc_table[exec_shadow].context,proc_table[exec].context);
TRACER_LOGEVENT(FTrace_EVT_inheritance,(unsigned short int)proc_table[exec_shadow].context,(unsigned int)proc_table[exec].context);
kern_context_load(proc_table[exec_shadow].context);
 
return 0;
/shark/trunk/kernel/modules/posix.c
20,11 → 20,11
 
/**
------------
CVS : $Id: posix.c,v 1.7 2004-01-08 20:10:41 giacomo Exp $
CVS : $Id: posix.c,v 1.8 2004-03-10 14:51:43 giacomo Exp $
 
File: $File$
Revision: $Revision: 1.7 $
Last update: $Date: 2004-01-08 20:10:41 $
Revision: $Revision: 1.8 $
Last update: $Date: 2004-03-10 14:51:43 $
------------
 
This file contains the scheduling module compatible with POSIX
265,7 → 265,7
proc_table[p].status = SLEEP;
 
jet_update_endcycle(); /* Update the Jet data... */
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,3,proc_table[p].context,l);
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,(unsigned short int)proc_table[p].context,(unsigned int)l);
 
return 0;
}
/shark/trunk/kernel/modules/srp.c
20,11 → 20,11
 
/**
------------
CVS : $Id: srp.c,v 1.6 2004-01-08 20:10:42 giacomo Exp $
CVS : $Id: srp.c,v 1.7 2004-03-10 14:51:44 giacomo Exp $
 
File: $File$
Revision: $Revision: 1.6 $
Last update: $Date: 2004-01-08 20:10:42 $
Revision: $Revision: 1.7 $
Last update: $Date: 2004-03-10 14:51:44 $
------------
 
Stack Resource Policy. see srp.h for general details...
720,7 → 720,7
}
 
scheduler();
TRACER_LOGEVENT(FTrace_EVT_inheritance,3,proc_table[exec_shadow].context,proc_table[exec].context);
TRACER_LOGEVENT(FTrace_EVT_inheritance,(unsigned short int)proc_table[exec_shadow].context,(unsigned int)proc_table[exec].context);
kern_context_load(proc_table[exec_shadow].context);
 
return 0;
/shark/trunk/kernel/modules/rr2.c
20,11 → 20,11
 
/**
------------
CVS : $Id: rr2.c,v 1.6 2004-01-08 20:10:42 giacomo Exp $
CVS : $Id: rr2.c,v 1.7 2004-03-10 14:51:44 giacomo Exp $
 
File: $File$
Revision: $Revision: 1.6 $
Last update: $Date: 2004-01-08 20:10:42 $
Revision: $Revision: 1.7 $
Last update: $Date: 2004-03-10 14:51:44 $
------------
 
This file contains the scheduling module RR2 (Round Robin) version 2
222,7 → 222,7
proc_table[p].status = SLEEP;
 
jet_update_endcycle(); /* Update the Jet data... */
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,3,proc_table[p].context,l);
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,(unsigned short int)proc_table[p].context,(unsigned int)l);
 
return 0;
}
/shark/trunk/kernel/modules/hardcbs.c
191,7 → 191,7
}
/* tracer stuff */
TRACER_LOGEVENT(FTrace_EVT_task_timer,3,p,proc_table[p].task_level);
TRACER_LOGEVENT(FTrace_EVT_task_timer,(unsigned short int)proc_table[p].context,(unsigned int)proc_table[p].task_level);
 
}
 
450,7 → 450,7
}
 
jet_update_endcycle(); /* Update the Jet data... */
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,3,p,l);
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,(unsigned short int)proc_table[p].context,(unsigned int)l);
 
break;
 
457,7 → 457,7
case 1:
 
lev->flag[p] |= HCBS_SLEEP;
TRACER_LOGEVENT(FTrace_EVT_task_disable,3,p,l);
TRACER_LOGEVENT(FTrace_EVT_task_disable,(unsigned short int)proc_table[p].context,(unsigned int)l);
 
break;
 
/shark/trunk/kernel/modules/ds.c
20,11 → 20,11
 
/**
------------
CVS : $Id: ds.c,v 1.6 2004-01-08 20:10:41 giacomo Exp $
CVS : $Id: ds.c,v 1.7 2004-03-10 14:51:43 giacomo Exp $
 
File: $File$
Revision: $Revision: 1.6 $
Last update: $Date: 2004-01-08 20:10:41 $
Revision: $Revision: 1.7 $
Last update: $Date: 2004-03-10 14:51:43 $
------------
 
This file contains the aperiodic server DS (Deferrable Server)
366,7 → 366,7
DS_activation(lev);
 
jet_update_endcycle(); /* Update the Jet data... */
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,3,proc_table[p].context,l);
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,(unsigned short int)proc_table[p].context,(unsigned int)l);
 
return 0;
}
/shark/trunk/kernel/modules/cbs.c
20,11 → 20,11
 
/**
------------
CVS : $Id: cbs.c,v 1.9 2004-01-08 20:10:40 giacomo Exp $
CVS : $Id: cbs.c,v 1.10 2004-03-10 14:51:43 giacomo Exp $
 
File: $File$
Revision: $Revision: 1.9 $
Last update: $Date: 2004-01-08 20:10:40 $
Revision: $Revision: 1.10 $
Last update: $Date: 2004-03-10 14:51:43 $
------------
 
This file contains the aperiodic server CBS (Total Bandwidth Server)
240,7 → 240,7
if (p==5) cbs_counter2++;
#endif
/* tracer stuff */
TRACER_LOGEVENT(FTrace_EVT_task_timer,3,proc_table[p].context,proc_table[p].task_level);
TRACER_LOGEVENT(FTrace_EVT_task_timer,(unsigned short int)proc_table[p].context,(unsigned int)proc_table[p].task_level);
 
}
 
493,7 → 493,7
}
 
jet_update_endcycle(); /* Update the Jet data... */
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,3,proc_table[p].context,l);
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,(unsigned short int)proc_table[p].context,(unsigned int)l);
 
break;
 
500,7 → 500,7
case 1:
 
lev->flag[p] |= CBS_SLEEP;
TRACER_LOGEVENT(FTrace_EVT_task_disable,3,proc_table[p].context,l);
TRACER_LOGEVENT(FTrace_EVT_task_disable,(unsigned short int)proc_table[p].context,(unsigned int)l);
 
break;
 
/shark/trunk/kernel/modules/pi.c
20,11 → 20,11
 
/**
------------
CVS : $Id: pi.c,v 1.6 2004-01-08 20:10:41 giacomo Exp $
CVS : $Id: pi.c,v 1.7 2004-03-10 14:51:43 giacomo Exp $
 
File: $File$
Revision: $Revision: 1.6 $
Last update: $Date: 2004-01-08 20:10:41 $
Revision: $Revision: 1.7 $
Last update: $Date: 2004-03-10 14:51:43 $
------------
 
Priority Inhertitance protocol. see pi.h for more details...
198,7 → 198,7
// kern_printf("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<");
/* ... call the scheduler... */
scheduler();
TRACER_LOGEVENT(FTrace_EVT_inheritance,3,proc_table[exec_shadow].context,proc_table[exec].context);
TRACER_LOGEVENT(FTrace_EVT_inheritance,(unsigned short int)proc_table[exec_shadow].context,(unsigned int)proc_table[exec].context);
kern_context_load(proc_table[exec_shadow].context);
 
/* ... and reaquire the cli() before the test... */
292,7 → 292,7
}*/
 
scheduler();
TRACER_LOGEVENT(FTrace_EVT_inheritance,3,proc_table[exec_shadow].context,proc_table[exec].context);
TRACER_LOGEVENT(FTrace_EVT_inheritance,(unsigned short int)proc_table[exec_shadow].context,(unsigned int)proc_table[exec].context);
kern_context_load(proc_table[exec_shadow].context);
 
return 0;
/shark/trunk/kernel/modules/rm.c
20,11 → 20,11
 
/**
------------
CVS : $Id: rm.c,v 1.7 2004-01-08 20:10:42 giacomo Exp $
CVS : $Id: rm.c,v 1.8 2004-03-10 14:51:44 giacomo Exp $
 
File: $File$
Revision: $Revision: 1.7 $
Last update: $Date: 2004-01-08 20:10:42 $
Revision: $Revision: 1.8 $
Last update: $Date: 2004-03-10 14:51:44 $
------------
 
This file contains the scheduling module RM (Rate Monotonic)
122,7 → 122,7
 
case RM_IDLE:
/* tracer stuff */
TRACER_LOGEVENT(FTrace_EVT_task_timer,3,proc_table[p].context,proc_table[p].task_level);
TRACER_LOGEVENT(FTrace_EVT_task_timer,(unsigned short int)proc_table[p].context,(unsigned int)proc_table[p].task_level);
/* similar to RM_task_activate */
temp = iq_query_timespec(p, &lev->ready);
ADDUSEC2TIMESPEC(lev->period[p], temp);
335,7 → 335,7
proc_table[p].avail_time = proc_table[p].wcet;
 
jet_update_endcycle(); /* Update the Jet data... */
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,3,proc_table[p].context,l);
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,(unsigned short int)proc_table[p].context,(unsigned int)l);
/* when the deadline timer fire, it recognize the situation and set
correctly all the stuffs (like reactivation, sleep, etc... ) */
/shark/trunk/kernel/modules/rrsoft.c
20,11 → 20,11
 
/**
------------
CVS : $Id: rrsoft.c,v 1.7 2004-01-08 20:10:42 giacomo Exp $
CVS : $Id: rrsoft.c,v 1.8 2004-03-10 14:51:44 giacomo Exp $
 
File: $File$
Revision: $Revision: 1.7 $
Last update: $Date: 2004-01-08 20:10:42 $
Revision: $Revision: 1.8 $
Last update: $Date: 2004-03-10 14:51:44 $
------------
 
This file contains the scheduling module RRSOFT (Round Robin)
323,7 → 323,7
proc_table[p].status = RRSOFT_IDLE;
 
jet_update_endcycle(); /* Update the Jet data... */
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,3,proc_table[p].context,l);
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,(unsigned short int)proc_table[p].context,(unsigned int)l);
return 0;
}
/shark/trunk/kernel/modules/ps.c
20,11 → 20,11
 
/**
------------
CVS : $Id: ps.c,v 1.6 2004-01-08 20:10:41 giacomo Exp $
CVS : $Id: ps.c,v 1.7 2004-03-10 14:51:44 giacomo Exp $
 
File: $File$
Revision: $Revision: 1.6 $
Last update: $Date: 2004-01-08 20:10:41 $
Revision: $Revision: 1.7 $
Last update: $Date: 2004-03-10 14:51:44 $
------------
 
This file contains the aperiodic server PS (Polling Server)
408,7 → 408,7
PS_activation(lev);
 
jet_update_endcycle(); /* Update the Jet data... */
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,3,proc_table[p].context,l);
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,(unsigned short int)proc_table[p].context,(unsigned int)l);
 
return 0;
}
/shark/trunk/kernel/modules/rr.c
20,11 → 20,11
 
/**
------------
CVS : $Id: rr.c,v 1.7 2004-01-08 20:10:42 giacomo Exp $
CVS : $Id: rr.c,v 1.8 2004-03-10 14:51:44 giacomo Exp $
 
File: $File$
Revision: $Revision: 1.7 $
Last update: $Date: 2004-01-08 20:10:42 $
Revision: $Revision: 1.8 $
Last update: $Date: 2004-03-10 14:51:44 $
------------
 
This file contains the scheduling module RR (Round Robin)
246,7 → 246,7
proc_table[p].status = SLEEP;
 
jet_update_endcycle(); /* Update the Jet data... */
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,3,proc_table[p].context,l); /* tracer stuff */
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,(unsigned short int)proc_table[p].context,(unsigned int)l); /* tracer stuff */
 
#ifdef RRDEBUG
rr_printf("(msg%d)",p);
/shark/trunk/kernel/modules/sem.c
20,11 → 20,11
 
/**
------------
CVS : $Id: sem.c,v 1.8 2004-01-08 20:10:42 giacomo Exp $
CVS : $Id: sem.c,v 1.9 2004-03-10 14:51:44 giacomo Exp $
 
File: $File$
Revision: $Revision: 1.8 $
Last update: $Date: 2004-01-08 20:10:42 $
Revision: $Revision: 1.9 $
Last update: $Date: 2004-03-10 14:51:44 $
------------
 
This file contains the Hartik 3.3.1 Semaphore functions
360,7 → 360,7
LEVEL l; /* for readableness only */
 
/* tracer stuff */
TRACER_LOGEVENT(FTrace_EVT_set_mutex_wait,3,*s,proc_table[exec_shadow].context);
TRACER_LOGEVENT(FTrace_EVT_set_mutex_wait,(unsigned short int)proc_table[exec_shadow].context,(unsigned int)*s);
 
kern_epilogue_macro();
 
388,7 → 388,7
else {
s1->count--;
/* tracer stuff */
TRACER_LOGEVENT(FTrace_EVT_set_mutex_wait,3,*s,proc_table[exec_shadow].context);
TRACER_LOGEVENT(FTrace_EVT_set_mutex_wait,(unsigned short int)proc_table[exec_shadow].context,(unsigned int)*s);
kern_context_load(proc_table[exec_shadow].context);
}
 
470,7 → 470,7
LEVEL l; /* for readableness only */
 
/* tracer */
TRACER_LOGEVENT(FTrace_EVT_set_mutex_wait,3,*s,proc_table[exec_shadow].context);
TRACER_LOGEVENT(FTrace_EVT_set_mutex_wait,(unsigned short int)proc_table[exec_shadow].context,(unsigned int)*s);
kern_epilogue_macro();
498,7 → 498,7
else {
s1->count -= n;
/* tracer */
TRACER_LOGEVENT(FTrace_EVT_set_mutex_wait,3,*s,proc_table[exec_shadow].context);
TRACER_LOGEVENT(FTrace_EVT_set_mutex_wait,(unsigned short int)proc_table[exec_shadow].context,(unsigned int)*s);
kern_context_load(proc_table[exec_shadow].context);
}
}
545,7 → 545,7
}
/* tracer */
TRACER_LOGEVENT(FTrace_EVT_set_mutex_lock,3,*s,proc_table[exec_shadow].context);
TRACER_LOGEVENT(FTrace_EVT_set_mutex_lock,(unsigned short int)proc_table[exec_shadow].context,(unsigned int)*s);
kern_frestore(f);
}
else {
570,7 → 570,7
}
/* tracer */
TRACER_LOGEVENT(FTrace_EVT_set_mutex_lock,3,*s,proc_table[exec_shadow].context);
TRACER_LOGEVENT(FTrace_EVT_set_mutex_lock,(unsigned short int)proc_table[exec_shadow].context,(unsigned int)*s);
kern_context_load(proc_table[exec_shadow].context);
}
620,7 → 620,7
}
/* tracer */
TRACER_LOGEVENT(FTrace_EVT_set_mutex_lock,3,*s,proc_table[exec_shadow].context);
TRACER_LOGEVENT(FTrace_EVT_set_mutex_lock,(unsigned short int)proc_table[exec_shadow].context,(unsigned int)*s);
/* Preempt if necessary */
if (fl) event_need_reschedule();
650,7 → 650,7
}
/* tracer */
TRACER_LOGEVENT(FTrace_EVT_set_mutex_lock,3,*s,proc_table[exec_shadow].context);
TRACER_LOGEVENT(FTrace_EVT_set_mutex_lock,(unsigned short int)proc_table[exec_shadow].context,(unsigned int)*s);
/* Preempt if necessary */
if (fl) scheduler();
/shark/trunk/kernel/modules/ss.c
20,11 → 20,11
 
/**
------------
CVS : $Id: ss.c,v 1.6 2004-01-08 20:10:42 giacomo Exp $
CVS : $Id: ss.c,v 1.7 2004-03-10 14:51:45 giacomo Exp $
 
File: $File$
Revision: $Revision: 1.6 $
Last update: $Date: 2004-01-08 20:10:42 $
Revision: $Revision: 1.7 $
Last update: $Date: 2004-03-10 14:51:45 $
------------
 
This file contains the aperiodic Sporadic Server (SS).
885,7 → 885,7
}
 
jet_update_endcycle(); /* Update the Jet data... */
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,3,proc_table[p].context,l);
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,(unsigned short int)proc_table[p].context,(unsigned int)l);
 
return 0;
}
/shark/trunk/kernel/modules/tbs.c
20,11 → 20,11
 
/**
------------
CVS : $Id: tbs.c,v 1.6 2004-01-08 20:10:42 giacomo Exp $
CVS : $Id: tbs.c,v 1.7 2004-03-10 14:51:45 giacomo Exp $
 
File: $File$
Revision: $Revision: 1.6 $
Last update: $Date: 2004-01-08 20:10:42 $
Revision: $Revision: 1.7 $
Last update: $Date: 2004-03-10 14:51:45 $
------------
 
This file contains the aperiodic server TBS (Total Bandwidth Server)
329,7 → 329,7
TBS_activation(lev);
 
jet_update_endcycle(); /* Update the Jet data... */
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,3,proc_table[p].context,l);
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,(unsigned short int)proc_table[p].context,(unsigned int)l);
return 0;
}