/shark/trunk/tracer/include/tracer.h |
---|
71,8 → 71,8 |
#define TRACER_LOGEVENT FTrace_safe_ipoint |
#define FAST_TRACER_LOGEVENT FTrace_unsafe_ipoint |
void FTrace_unsafe_ipoint(WORD type, WORD par1, DWORD par2); |
void FTrace_safe_ipoint(WORD type, WORD par1, DWORD par2); |
void FTrace_unsafe_ipoint(BYTE type, BYTE flags, DWORD par1, DWORD par2); |
void FTrace_safe_ipoint(BYTE type, BYTE flags, DWORD par1, DWORD par2); |
#else |
/shark/trunk/oslib/kl/event.c |
---|
100,7 → 100,7 |
struct event *p; |
struct event *p1, *t; |
TRACER_LOGEVENT(FTrace_EVT_timer_post, 0, 0); |
TRACER_LOGEVENT(FTrace_EVT_timer_post, 0, 0, 0); |
if (!freeevents) { |
message("NO FREE EVENTS !\n"); |
147,7 → 147,7 |
{ |
struct event *p1, *t; |
TRACER_LOGEVENT(FTrace_EVT_timer_delete, 0, 0); |
TRACER_LOGEVENT(FTrace_EVT_timer_delete, 0, 0, 0); |
if (index == -1) |
return -1; |
180,7 → 180,7 |
WORD tmp; |
#endif |
TRACER_LOGEVENT(FTrace_EVT_timer_wakeup_start, 0, 0); |
TRACER_LOGEVENT(FTrace_EVT_timer_wakeup_start, 0, 0, 0); |
#ifndef __TSC__ |
tmp = pit_read(frc); |
222,7 → 222,7 |
} |
activeInt--; |
TRACER_LOGEVENT(FTrace_EVT_timer_wakeup_end, (unsigned short int)currCtx, 0); |
TRACER_LOGEVENT(FTrace_EVT_timer_wakeup_end, 1, (int)currCtx, 0); |
} |
/shark/trunk/oslib/kl/event1.c |
---|
73,7 → 73,7 |
int done; |
DWORD tnext; |
TRACER_LOGEVENT(FTrace_EVT_timer_post, 0, 0); |
TRACER_LOGEVENT(FTrace_EVT_timer_post, 0, 0, 0); |
if (!freeevents) { |
message("NO FREE EVENTS !\n"); |
143,7 → 143,7 |
#endif |
DWORD tnext; |
TRACER_LOGEVENT(FTrace_EVT_timer_wakeup_start, 0, 0); |
TRACER_LOGEVENT(FTrace_EVT_timer_wakeup_start, 0, 0, 0); |
#ifndef __TSC__ |
224,7 → 224,7 |
#endif |
} |
TRACER_LOGEVENT(FTrace_EVT_timer_wakeup_end, (unsigned short int)currCtx, 0); |
TRACER_LOGEVENT(FTrace_EVT_timer_wakeup_end, 1, (int)currCtx, 0); |
} |
235,7 → 235,7 |
DWORD tnext; |
int firstdeleted = FALSE; |
TRACER_LOGEVENT(FTrace_EVT_timer_delete, 0, 0); |
TRACER_LOGEVENT(FTrace_EVT_timer_delete, 0, 0, 0); |
if (index == -1) |
return -1; |
/shark/trunk/oslib/xlib/ctxsw.c |
---|
41,7 → 41,7 |
#ifdef __VIRCSW__ |
currCtx = c; |
if (activeInt == 0) { |
TRACER_LOGEVENT(FTrace_EVT_context_switch, (unsigned short int)c, 0); |
TRACER_LOGEVENT(FTrace_EVT_context_switch, 1, (int)c, 0); |
context_load(c); |
} |
#else |
66,6 → 66,6 |
void ll_context_load(CONTEXT c) |
{ |
currCtx = c; |
TRACER_LOGEVENT(FTrace_EVT_context_switch, (unsigned short int)c, 0); |
TRACER_LOGEVENT(FTrace_EVT_context_switch, 1, (int)c, 0); |
context_load(c); |
} |
/shark/trunk/kernel/signal.c |
---|
18,11 → 18,11 |
/** |
------------ |
CVS : $Id: signal.c,v 1.10 2004-03-10 14:51:42 giacomo Exp $ |
CVS : $Id: signal.c,v 1.9 2004-03-09 08:53:18 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.10 $ |
Last update: $Date: 2004-03-10 14:51:42 $ |
Revision: $Revision: 1.9 $ |
Last update: $Date: 2004-03-09 08:53:18 $ |
------------ |
This file contains: |
1400,7 → 1400,7 |
PID p; |
/* tracer stuff */ |
TRACER_LOGEVENT(FTrace_EVT_interrupt_start,(unsigned short int)no,0); |
TRACER_LOGEVENT(FTrace_EVT_interrupt_start,1,no,0); |
if (int_table[no].fast != NULL) { |
if (int_table[no].irqLock == FALSE) |
1410,7 → 1410,7 |
kern_cli(); |
} |
TRACER_LOGEVENT(FTrace_EVT_interrupt_end,(unsigned short int)no,0); |
TRACER_LOGEVENT(FTrace_EVT_interrupt_end,1,no,0); |
/* If a sporadic process is linked,activate it */ |
p = int_table[no].proc_index; |
/shark/trunk/kernel/modules/edf.c |
---|
20,11 → 20,11 |
/** |
------------ |
CVS : $Id: edf.c,v 1.13 2004-03-10 14:51:43 giacomo Exp $ |
CVS : $Id: edf.c,v 1.12 2004-02-10 17:50:04 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.13 $ |
Last update: $Date: 2004-03-10 14:51:43 $ |
Revision: $Revision: 1.12 $ |
Last update: $Date: 2004-02-10 17:50:04 $ |
------------ |
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,(unsigned short int)proc_table[p].context,(unsigned int)proc_table[p].task_level); |
TRACER_LOGEVENT(FTrace_EVT_task_timer,3,proc_table[p].context,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,(unsigned short int)proc_table[p].context,0); |
TRACER_LOGEVENT(FTrace_EVT_task_deadline_miss,1,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,(unsigned short int)proc_table[p].context,0); |
TRACER_LOGEVENT(FTrace_EVT_task_deadline_miss,1,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,(unsigned short int)proc_table[p].context,0); |
TRACER_LOGEVENT(FTrace_EVT_task_wcet_violation,1,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,(unsigned short int)proc_table[p].context,(unsigned int)l); |
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,3,proc_table[p].context,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,(unsigned short int)proc_table[p].context,(unsigned int)l); |
TRACER_LOGEVENT(FTrace_EVT_task_disable,3,proc_table[p].context,l); |
break; |
/shark/trunk/kernel/modules/pc.c |
---|
20,11 → 20,11 |
/** |
------------ |
CVS : $Id: pc.c,v 1.8 2004-03-10 14:51:43 giacomo Exp $ |
CVS : $Id: pc.c,v 1.7 2004-01-08 20:10:41 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.8 $ |
Last update: $Date: 2004-03-10 14:51:43 $ |
Revision: $Revision: 1.7 $ |
Last update: $Date: 2004-01-08 20:10:41 $ |
------------ |
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,(unsigned short int)proc_table[exec_shadow].context,(unsigned int)proc_table[exec].context); |
TRACER_LOGEVENT(FTrace_EVT_inheritance,3,proc_table[exec_shadow].context,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,(unsigned short int)proc_table[exec_shadow].context,(unsigned int)proc_table[exec].context); |
TRACER_LOGEVENT(FTrace_EVT_inheritance,3,proc_table[exec_shadow].context,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.8 2004-03-10 14:51:43 giacomo Exp $ |
CVS : $Id: posix.c,v 1.7 2004-01-08 20:10:41 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.8 $ |
Last update: $Date: 2004-03-10 14:51:43 $ |
Revision: $Revision: 1.7 $ |
Last update: $Date: 2004-01-08 20:10:41 $ |
------------ |
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,(unsigned short int)proc_table[p].context,(unsigned int)l); |
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,3,proc_table[p].context,l); |
return 0; |
} |
/shark/trunk/kernel/modules/srp.c |
---|
20,11 → 20,11 |
/** |
------------ |
CVS : $Id: srp.c,v 1.7 2004-03-10 14:51:44 giacomo Exp $ |
CVS : $Id: srp.c,v 1.6 2004-01-08 20:10:42 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.7 $ |
Last update: $Date: 2004-03-10 14:51:44 $ |
Revision: $Revision: 1.6 $ |
Last update: $Date: 2004-01-08 20:10:42 $ |
------------ |
Stack Resource Policy. see srp.h for general details... |
720,7 → 720,7 |
} |
scheduler(); |
TRACER_LOGEVENT(FTrace_EVT_inheritance,(unsigned short int)proc_table[exec_shadow].context,(unsigned int)proc_table[exec].context); |
TRACER_LOGEVENT(FTrace_EVT_inheritance,3,proc_table[exec_shadow].context,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.7 2004-03-10 14:51:44 giacomo Exp $ |
CVS : $Id: rr2.c,v 1.6 2004-01-08 20:10:42 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.7 $ |
Last update: $Date: 2004-03-10 14:51:44 $ |
Revision: $Revision: 1.6 $ |
Last update: $Date: 2004-01-08 20:10:42 $ |
------------ |
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,(unsigned short int)proc_table[p].context,(unsigned int)l); |
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,3,proc_table[p].context,l); |
return 0; |
} |
/shark/trunk/kernel/modules/hardcbs.c |
---|
191,7 → 191,7 |
} |
/* tracer stuff */ |
TRACER_LOGEVENT(FTrace_EVT_task_timer,(unsigned short int)proc_table[p].context,(unsigned int)proc_table[p].task_level); |
TRACER_LOGEVENT(FTrace_EVT_task_timer,3,p,proc_table[p].task_level); |
} |
450,7 → 450,7 |
} |
jet_update_endcycle(); /* Update the Jet data... */ |
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,(unsigned short int)proc_table[p].context,(unsigned int)l); |
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,3,p,l); |
break; |
457,7 → 457,7 |
case 1: |
lev->flag[p] |= HCBS_SLEEP; |
TRACER_LOGEVENT(FTrace_EVT_task_disable,(unsigned short int)proc_table[p].context,(unsigned int)l); |
TRACER_LOGEVENT(FTrace_EVT_task_disable,3,p,l); |
break; |
/shark/trunk/kernel/modules/ds.c |
---|
20,11 → 20,11 |
/** |
------------ |
CVS : $Id: ds.c,v 1.7 2004-03-10 14:51:43 giacomo Exp $ |
CVS : $Id: ds.c,v 1.6 2004-01-08 20:10:41 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.7 $ |
Last update: $Date: 2004-03-10 14:51:43 $ |
Revision: $Revision: 1.6 $ |
Last update: $Date: 2004-01-08 20:10:41 $ |
------------ |
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,(unsigned short int)proc_table[p].context,(unsigned int)l); |
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,3,proc_table[p].context,l); |
return 0; |
} |
/shark/trunk/kernel/modules/cbs.c |
---|
20,11 → 20,11 |
/** |
------------ |
CVS : $Id: cbs.c,v 1.10 2004-03-10 14:51:43 giacomo Exp $ |
CVS : $Id: cbs.c,v 1.9 2004-01-08 20:10:40 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.10 $ |
Last update: $Date: 2004-03-10 14:51:43 $ |
Revision: $Revision: 1.9 $ |
Last update: $Date: 2004-01-08 20:10:40 $ |
------------ |
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,(unsigned short int)proc_table[p].context,(unsigned int)proc_table[p].task_level); |
TRACER_LOGEVENT(FTrace_EVT_task_timer,3,proc_table[p].context,proc_table[p].task_level); |
} |
493,7 → 493,7 |
} |
jet_update_endcycle(); /* Update the Jet data... */ |
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,(unsigned short int)proc_table[p].context,(unsigned int)l); |
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,3,proc_table[p].context,l); |
break; |
500,7 → 500,7 |
case 1: |
lev->flag[p] |= CBS_SLEEP; |
TRACER_LOGEVENT(FTrace_EVT_task_disable,(unsigned short int)proc_table[p].context,(unsigned int)l); |
TRACER_LOGEVENT(FTrace_EVT_task_disable,3,proc_table[p].context,l); |
break; |
/shark/trunk/kernel/modules/pi.c |
---|
20,11 → 20,11 |
/** |
------------ |
CVS : $Id: pi.c,v 1.7 2004-03-10 14:51:43 giacomo Exp $ |
CVS : $Id: pi.c,v 1.6 2004-01-08 20:10:41 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.7 $ |
Last update: $Date: 2004-03-10 14:51:43 $ |
Revision: $Revision: 1.6 $ |
Last update: $Date: 2004-01-08 20:10:41 $ |
------------ |
Priority Inhertitance protocol. see pi.h for more details... |
198,7 → 198,7 |
// kern_printf("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"); |
/* ... call the scheduler... */ |
scheduler(); |
TRACER_LOGEVENT(FTrace_EVT_inheritance,(unsigned short int)proc_table[exec_shadow].context,(unsigned int)proc_table[exec].context); |
TRACER_LOGEVENT(FTrace_EVT_inheritance,3,proc_table[exec_shadow].context,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,(unsigned short int)proc_table[exec_shadow].context,(unsigned int)proc_table[exec].context); |
TRACER_LOGEVENT(FTrace_EVT_inheritance,3,proc_table[exec_shadow].context,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.8 2004-03-10 14:51:44 giacomo Exp $ |
CVS : $Id: rm.c,v 1.7 2004-01-08 20:10:42 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.8 $ |
Last update: $Date: 2004-03-10 14:51:44 $ |
Revision: $Revision: 1.7 $ |
Last update: $Date: 2004-01-08 20:10:42 $ |
------------ |
This file contains the scheduling module RM (Rate Monotonic) |
122,7 → 122,7 |
case RM_IDLE: |
/* tracer stuff */ |
TRACER_LOGEVENT(FTrace_EVT_task_timer,(unsigned short int)proc_table[p].context,(unsigned int)proc_table[p].task_level); |
TRACER_LOGEVENT(FTrace_EVT_task_timer,3,proc_table[p].context,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,(unsigned short int)proc_table[p].context,(unsigned int)l); |
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,3,proc_table[p].context,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.8 2004-03-10 14:51:44 giacomo Exp $ |
CVS : $Id: rrsoft.c,v 1.7 2004-01-08 20:10:42 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.8 $ |
Last update: $Date: 2004-03-10 14:51:44 $ |
Revision: $Revision: 1.7 $ |
Last update: $Date: 2004-01-08 20:10:42 $ |
------------ |
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,(unsigned short int)proc_table[p].context,(unsigned int)l); |
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,3,proc_table[p].context,l); |
return 0; |
} |
/shark/trunk/kernel/modules/ps.c |
---|
20,11 → 20,11 |
/** |
------------ |
CVS : $Id: ps.c,v 1.7 2004-03-10 14:51:44 giacomo Exp $ |
CVS : $Id: ps.c,v 1.6 2004-01-08 20:10:41 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.7 $ |
Last update: $Date: 2004-03-10 14:51:44 $ |
Revision: $Revision: 1.6 $ |
Last update: $Date: 2004-01-08 20:10:41 $ |
------------ |
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,(unsigned short int)proc_table[p].context,(unsigned int)l); |
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,3,proc_table[p].context,l); |
return 0; |
} |
/shark/trunk/kernel/modules/rr.c |
---|
20,11 → 20,11 |
/** |
------------ |
CVS : $Id: rr.c,v 1.8 2004-03-10 14:51:44 giacomo Exp $ |
CVS : $Id: rr.c,v 1.7 2004-01-08 20:10:42 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.8 $ |
Last update: $Date: 2004-03-10 14:51:44 $ |
Revision: $Revision: 1.7 $ |
Last update: $Date: 2004-01-08 20:10:42 $ |
------------ |
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,(unsigned short int)proc_table[p].context,(unsigned int)l); /* tracer stuff */ |
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,3,proc_table[p].context,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.9 2004-03-10 14:51:44 giacomo Exp $ |
CVS : $Id: sem.c,v 1.8 2004-01-08 20:10:42 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.9 $ |
Last update: $Date: 2004-03-10 14:51:44 $ |
Revision: $Revision: 1.8 $ |
Last update: $Date: 2004-01-08 20:10:42 $ |
------------ |
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,(unsigned short int)proc_table[exec_shadow].context,(unsigned int)*s); |
TRACER_LOGEVENT(FTrace_EVT_set_mutex_wait,3,*s,proc_table[exec_shadow].context); |
kern_epilogue_macro(); |
388,7 → 388,7 |
else { |
s1->count--; |
/* tracer stuff */ |
TRACER_LOGEVENT(FTrace_EVT_set_mutex_wait,(unsigned short int)proc_table[exec_shadow].context,(unsigned int)*s); |
TRACER_LOGEVENT(FTrace_EVT_set_mutex_wait,3,*s,proc_table[exec_shadow].context); |
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,(unsigned short int)proc_table[exec_shadow].context,(unsigned int)*s); |
TRACER_LOGEVENT(FTrace_EVT_set_mutex_wait,3,*s,proc_table[exec_shadow].context); |
kern_epilogue_macro(); |
498,7 → 498,7 |
else { |
s1->count -= n; |
/* tracer */ |
TRACER_LOGEVENT(FTrace_EVT_set_mutex_wait,(unsigned short int)proc_table[exec_shadow].context,(unsigned int)*s); |
TRACER_LOGEVENT(FTrace_EVT_set_mutex_wait,3,*s,proc_table[exec_shadow].context); |
kern_context_load(proc_table[exec_shadow].context); |
} |
} |
545,7 → 545,7 |
} |
/* tracer */ |
TRACER_LOGEVENT(FTrace_EVT_set_mutex_lock,(unsigned short int)proc_table[exec_shadow].context,(unsigned int)*s); |
TRACER_LOGEVENT(FTrace_EVT_set_mutex_lock,3,*s,proc_table[exec_shadow].context); |
kern_frestore(f); |
} |
else { |
570,7 → 570,7 |
} |
/* tracer */ |
TRACER_LOGEVENT(FTrace_EVT_set_mutex_lock,(unsigned short int)proc_table[exec_shadow].context,(unsigned int)*s); |
TRACER_LOGEVENT(FTrace_EVT_set_mutex_lock,3,*s,proc_table[exec_shadow].context); |
kern_context_load(proc_table[exec_shadow].context); |
} |
620,7 → 620,7 |
} |
/* tracer */ |
TRACER_LOGEVENT(FTrace_EVT_set_mutex_lock,(unsigned short int)proc_table[exec_shadow].context,(unsigned int)*s); |
TRACER_LOGEVENT(FTrace_EVT_set_mutex_lock,3,*s,proc_table[exec_shadow].context); |
/* Preempt if necessary */ |
if (fl) event_need_reschedule(); |
650,7 → 650,7 |
} |
/* tracer */ |
TRACER_LOGEVENT(FTrace_EVT_set_mutex_lock,(unsigned short int)proc_table[exec_shadow].context,(unsigned int)*s); |
TRACER_LOGEVENT(FTrace_EVT_set_mutex_lock,3,*s,proc_table[exec_shadow].context); |
/* Preempt if necessary */ |
if (fl) scheduler(); |
/shark/trunk/kernel/modules/ss.c |
---|
20,11 → 20,11 |
/** |
------------ |
CVS : $Id: ss.c,v 1.7 2004-03-10 14:51:45 giacomo Exp $ |
CVS : $Id: ss.c,v 1.6 2004-01-08 20:10:42 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.7 $ |
Last update: $Date: 2004-03-10 14:51:45 $ |
Revision: $Revision: 1.6 $ |
Last update: $Date: 2004-01-08 20:10:42 $ |
------------ |
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,(unsigned short int)proc_table[p].context,(unsigned int)l); |
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,3,proc_table[p].context,l); |
return 0; |
} |
/shark/trunk/kernel/modules/tbs.c |
---|
20,11 → 20,11 |
/** |
------------ |
CVS : $Id: tbs.c,v 1.7 2004-03-10 14:51:45 giacomo Exp $ |
CVS : $Id: tbs.c,v 1.6 2004-01-08 20:10:42 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.7 $ |
Last update: $Date: 2004-03-10 14:51:45 $ |
Revision: $Revision: 1.6 $ |
Last update: $Date: 2004-01-08 20:10:42 $ |
------------ |
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,(unsigned short int)proc_table[p].context,(unsigned int)l); |
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,3,proc_table[p].context,l); |
return 0; |
} |
/shark/trunk/kernel/kern.c |
---|
18,11 → 18,11 |
/** |
------------ |
CVS : $Id: kern.c,v 1.8 2004-03-10 14:51:42 giacomo Exp $ |
CVS : $Id: kern.c,v 1.7 2004-01-08 20:14:08 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.8 $ |
Last update: $Date: 2004-03-10 14:51:42 $ |
Revision: $Revision: 1.7 $ |
Last update: $Date: 2004-01-08 20:14:08 $ |
------------ |
This file contains: |
287,7 → 287,7 |
exec_shadow = proc_table[exec_shadow].shadow; |
/* tracer stuff */ |
TRACER_LOGEVENT(FTrace_EVT_task_schedule,(unsigned short int)proc_table[exec_shadow].context,(unsigned int)proc_table[exec].context); |
TRACER_LOGEVENT(FTrace_EVT_task_schedule,3,proc_table[exec_shadow].context,proc_table[exec].context); |
// kern_printf("[%i->%i]",old_exec_shadow,exec_shadow); |
/* we control the correctness of the shadows when we kill */ |
/shark/trunk/kernel/activate.c |
---|
18,11 → 18,11 |
/** |
------------ |
CVS : $Id: activate.c,v 1.7 2004-03-10 14:51:42 giacomo Exp $ |
CVS : $Id: activate.c,v 1.6 2004-01-08 20:14:08 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.7 $ |
Last update: $Date: 2004-03-10 14:51:42 $ |
Revision: $Revision: 1.6 $ |
Last update: $Date: 2004-01-08 20:14:08 $ |
------------ |
task_activate & group_activate |
118,7 → 118,7 |
proc_table[p].frozen_activations++; |
else { |
/* tracer stuff */ |
TRACER_LOGEVENT(FTrace_EVT_task_activate,(unsigned short int)proc_table[p].context,0); |
TRACER_LOGEVENT(FTrace_EVT_task_activate,1,proc_table[p].context,0); |
l = proc_table[p].task_level; |
level_table[l]->public_activate(l,p); |
160,7 → 160,7 |
continue; |
} |
/* tracer stuff */ |
TRACER_LOGEVENT(FTrace_EVT_task_activate,(unsigned short int)proc_table[i].context,0); |
TRACER_LOGEVENT(FTrace_EVT_task_activate,1,proc_table[i].context,0); |
l = proc_table[i].task_level; |
level_table[l]->public_activate(l,i); |
} |
179,7 → 179,7 |
continue; |
} |
/* tracer stuff */ |
TRACER_LOGEVENT(FTrace_EVT_task_activate,(unsigned short int)proc_table[i].context,0); |
TRACER_LOGEVENT(FTrace_EVT_task_activate,1,proc_table[i].context,0); |
l = proc_table[i].task_level; |
level_table[l]->public_activate(l,i); |
event_need_reschedule(); |
198,7 → 198,7 |
l = proc_table[i].task_level; |
level_table[l]->public_activate(l,i); |
/* tracer stuff */ |
TRACER_LOGEVENT(FTrace_EVT_task_activate,(unsigned short int)proc_table[i].context,0); |
TRACER_LOGEVENT(FTrace_EVT_task_activate,1,proc_table[i].context,0); |
} |
scheduler(); |
/shark/trunk/kernel/mutex.c |
---|
18,11 → 18,11 |
/** |
------------ |
CVS : $Id: mutex.c,v 1.6 2004-03-10 14:51:42 giacomo Exp $ |
CVS : $Id: mutex.c,v 1.5 2004-01-08 20:14:08 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.6 $ |
Last update: $Date: 2004-03-10 14:51:42 $ |
Revision: $Revision: 1.5 $ |
Last update: $Date: 2004-01-08 20:14:08 $ |
------------ |
This file contains the mutex and condition variables handling functions. |
138,7 → 138,7 |
if (mutex->mutexlevel == -1) |
return (EINVAL); |
TRACER_LOGEVENT(FTrace_EVT_set_mutex_lock,(unsigned short int)proc_table[exec_shadow].context,(unsigned int)(mutex)); |
TRACER_LOGEVENT(FTrace_EVT_set_mutex_lock,3,proc_table[exec_shadow].context,(int)(mutex)); |
m = (mutex_resource_des *)resource_table[mutex->mutexlevel]; |
164,7 → 164,7 |
if (mutex->mutexlevel == -1) |
return (EINVAL); |
TRACER_LOGEVENT(FTrace_EVT_set_mutex_unlock,(unsigned short int)proc_table[exec_shadow].context,(unsigned int)(mutex)); |
TRACER_LOGEVENT(FTrace_EVT_set_mutex_unlock,3,proc_table[exec_shadow].context,(int)(mutex)); |
m = (mutex_resource_des *)resource_table[mutex->mutexlevel]; |
/shark/trunk/kernel/grpcreat.c |
---|
18,11 → 18,11 |
/** |
------------ |
CVS : $Id: grpcreat.c,v 1.7 2004-03-10 14:51:42 giacomo Exp $ |
CVS : $Id: grpcreat.c,v 1.6 2004-01-08 20:14:08 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.7 $ |
Last update: $Date: 2004-03-10 14:51:42 $ |
Revision: $Revision: 1.6 $ |
Last update: $Date: 2004-01-08 20:14:08 $ |
------------ |
This file contains: |
301,7 → 301,7 |
proc_table[i].context = c; |
/* Tracer stuff */ |
TRACER_LOGEVENT(FTrace_EVT_task_create,(unsigned short int)c,(unsigned int)i); |
TRACER_LOGEVENT(FTrace_EVT_task_create,3,c,i); |
//kern_printf("[c%i %i]",i,proc_table[i].context); |
/shark/trunk/kernel/kill.c |
---|
18,11 → 18,11 |
/** |
------------ |
CVS : $Id: kill.c,v 1.8 2004-03-10 14:51:42 giacomo Exp $ |
CVS : $Id: kill.c,v 1.7 2003-12-10 16:54:59 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.8 $ |
Last update: $Date: 2004-03-10 14:51:42 $ |
Revision: $Revision: 1.7 $ |
Last update: $Date: 2003-12-10 16:54:59 $ |
------------ |
This file contains: |
169,7 → 169,7 |
kern_context_delete(proc_table[i].context); |
/* tracer stuff */ |
TRACER_LOGEVENT(FTrace_EVT_task_end,(unsigned short int)i,0); |
TRACER_LOGEVENT(FTrace_EVT_task_end,1,i,0); |
//kern_printf("[k%i]",i); |
/* Free the used stack area */ |
/shark/trunk/shark.cfg |
---|
9,7 → 9,7 |
# Enable timer interrupt through P6 APIC instead of PIT |
# Only P6 or higher CPU class, TSC support must be enabled |
APIC = TRUE |
APIC = FALSE |
#Enable Read Timer Optimization |
#TIMER_OPT = 1000 (For CPU < 1 GHz - Wraparound 585 years) |
20,7 → 20,7 |
#Select the events tracer |
# TRACER = "NO","OLD","NEW" |
TRACER = "NEW" |
TRACER = "NO" |
#Select the BIOS INTERRUPT access mode |
#BIOS = "X","VM86" |
/shark/trunk/ports/first/modules/grubstar.c |
---|
110,7 → 110,7 |
if (b->avail > b->Q) b->avail = b->Q; |
/* Tracer */ |
TRACER_LOGEVENT(FTrace_EVT_server_replenish,0,(unsigned int)(b)); |
TRACER_LOGEVENT(FTrace_EVT_server_replenish,1,(int)(b),0); |
if (b->flags==GRUBSTAR_RECLAIMING && b->avail>0) |
if (lev->Uf < lev->U) lev->Uf += b->Ub; |
167,7 → 167,7 |
if (b->current == NIL && iq_query_first(&(b->tasks)) == NIL && b->flags != GRUBSTAR_RECLAIMING) { |
event_need_reschedule(); |
TRACER_LOGEVENT(FTrace_EVT_server_reclaiming,0,(unsigned int)b); |
TRACER_LOGEVENT(FTrace_EVT_server_reclaiming,1,(int)(b),0); |
b->flags = GRUBSTAR_RECLAIMING; |
lev->Uf -= b->Ub; |
} |
196,7 → 196,7 |
kern_printf("(GS:Act %d)",p); |
#endif |
TRACER_LOGEVENT(FTrace_EVT_server_active,0,(unsigned int)b); |
TRACER_LOGEVENT(FTrace_EVT_server_active,1,(int)(b),0); |
if (b->vtimer!=NIL) kern_event_delete(b->vtimer); |
b->vtimer=NIL; |
252,7 → 252,7 |
#endif |
if (b->avail <= 0) { |
TRACER_LOGEVENT(FTrace_EVT_server_exhaust,0,(unsigned int)(b)); |
TRACER_LOGEVENT(FTrace_EVT_server_exhaust,1,(int)(b),0); |
b->flags = GRUBSTAR_NOACTIVE; |
} |
312,7 → 312,7 |
b->last_reclaiming = 0; |
/* Tracer */ |
TRACER_LOGEVENT(FTrace_EVT_server_replenish,0,(unsigned int)(b)); |
TRACER_LOGEVENT(FTrace_EVT_server_replenish,1,(int)(b),0); |
if (b->flags == GRUBSTAR_RECLAIMING) { |
if (lev->Uf < lev->U) lev->Uf += b->Ub; |
463,7 → 463,7 |
mul32div32to32(lev->b[lev->tb[exec]].avail,(lev->U-lev->Uf),MAX_BANDWIDTH,lev->b[lev->tb[exec]].last_reclaiming); |
if (lev->b[lev->tb[exec]].last_reclaiming > 0) |
TRACER_LOGEVENT(FTrace_EVT_server_using_rec,(unsigned short int)lev->b[lev->tb[exec]].last_reclaiming,(unsigned int)(&lev->b[lev->tb[exec]])); |
TRACER_LOGEVENT(FTrace_EVT_server_using_rec,3,(int)(&lev->b[lev->tb[exec]]),lev->b[lev->tb[exec]].last_reclaiming); |
temp = lev->b[lev->tb[exec]].avail + lev->b[lev->tb[exec]].last_reclaiming; |
537,7 → 537,7 |
b->vtimer=NIL; |
} |
TRACER_LOGEVENT(FTrace_EVT_server_reclaiming,0,(unsigned int)(b)); |
TRACER_LOGEVENT(FTrace_EVT_server_reclaiming,1,(int)(b),0); |
b->flags = GRUBSTAR_RECLAIMING; |
lev->Uf -= b->Ub; |
645,6 → 645,8 |
lev->b[r].loc_sched_level = local_scheduler_level; |
lev->b[r].last_reclaiming = 0; |
TRACER_LOGEVENT(FTrace_EVT_server_create,3,(int)(&(lev->b[r])),r); |
return r; |
} |
else |
676,6 → 678,8 |
lev->b[budget].flags = GRUBSTAR_RECLAIMING; |
lev->b[budget].last_reclaiming = 0; |
TRACER_LOGEVENT(FTrace_EVT_server_remove,3,(int)(&(lev->b[budget])),budget); |
return 0; |
} |