/shark/trunk/kernel/kern.c |
---|
18,11 → 18,11 |
/** |
------------ |
CVS : $Id: kern.c,v 1.6 2003-12-10 16:54:59 giacomo Exp $ |
CVS : $Id: kern.c,v 1.7 2004-01-08 20:14:08 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.6 $ |
Last update: $Date: 2003-12-10 16:54:59 $ |
Revision: $Revision: 1.7 $ |
Last update: $Date: 2004-01-08 20:14:08 $ |
------------ |
This file contains: |
287,8 → 287,7 |
exec_shadow = proc_table[exec_shadow].shadow; |
/* tracer stuff */ |
if (old_exec_shadow!=exec_shadow) |
TRACER_LOGEVENT(FTrace_EVT_task_schedule,1,exec_shadow,0); |
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.5 2003-12-10 16:54:58 giacomo Exp $ |
CVS : $Id: activate.c,v 1.6 2004-01-08 20:14:08 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.5 $ |
Last update: $Date: 2003-12-10 16:54:58 $ |
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,1,p,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,1,i,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,1,i,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,1,i,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.4 2003-11-05 15:05:12 giacomo Exp $ |
CVS : $Id: mutex.c,v 1.5 2004-01-08 20:14:08 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.4 $ |
Last update: $Date: 2003-11-05 15:05:12 $ |
Revision: $Revision: 1.5 $ |
Last update: $Date: 2004-01-08 20:14:08 $ |
------------ |
This file contains the mutex and condition variables handling functions. |
81,6 → 81,8 |
#include <kernel/func.h> |
#include <errno.h> |
#include <tracer.h> |
/*---------------------------------------------------------------------*/ |
/* Mutexes */ |
/*---------------------------------------------------------------------*/ |
136,6 → 138,8 |
if (mutex->mutexlevel == -1) |
return (EINVAL); |
TRACER_LOGEVENT(FTrace_EVT_set_mutex_lock,3,proc_table[exec_shadow].context,(int)(mutex)); |
m = (mutex_resource_des *)resource_table[mutex->mutexlevel]; |
return m->lock(mutex->mutexlevel, mutex); |
160,6 → 164,8 |
if (mutex->mutexlevel == -1) |
return (EINVAL); |
TRACER_LOGEVENT(FTrace_EVT_set_mutex_unlock,3,proc_table[exec_shadow].context,(int)(mutex)); |
m = (mutex_resource_des *)resource_table[mutex->mutexlevel]; |
return m->unlock(mutex->mutexlevel, mutex); |
/shark/trunk/kernel/grpcreat.c |
---|
18,11 → 18,11 |
/** |
------------ |
CVS : $Id: grpcreat.c,v 1.5 2003-12-10 16:54:58 giacomo Exp $ |
CVS : $Id: grpcreat.c,v 1.6 2004-01-08 20:14:08 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.5 $ |
Last update: $Date: 2003-12-10 16:54:58 $ |
Revision: $Revision: 1.6 $ |
Last update: $Date: 2004-01-08 20:14:08 $ |
------------ |
This file contains: |
113,8 → 113,6 |
RES_MODEL *r; /* used for managing the resources models */ |
int j; /* a counter */ |
printk("task_create\n"); |
/* Get a free descriptor */ |
for (;;) { |
i = iq_getfirst(&freedesc); |
303,7 → 301,7 |
proc_table[i].context = c; |
/* Tracer stuff */ |
TRACER_LOGEVENT(FTrace_EVT_task_create,3,i,(int)c); |
TRACER_LOGEVENT(FTrace_EVT_task_create,3,c,i); |
//kern_printf("[c%i %i]",i,proc_table[i].context); |
/shark/trunk/kernel/printk.c |
---|
36,11 → 36,11 |
*/ |
/* |
* CVS : $Id: printk.c,v 1.2 2002-10-28 07:56:49 pj Exp $ |
* CVS : $Id: printk.c,v 1.3 2004-01-08 20:14:08 giacomo Exp $ |
* |
* File: $File$ |
* Revision: $Revision: 1.2 $ |
* Last update: $Date: 2002-10-28 07:56:49 $ |
* Revision: $Revision: 1.3 $ |
* Last update: $Date: 2004-01-08 20:14:08 $ |
*/ |
#include <ll/i386/cons.h> |
52,6 → 52,8 |
static int printklevel=0; |
#define NO_LEVEL 100 |
static char *levelname[]={ |
"emerg ", |
"alert ", |
65,27 → 67,27 |
static int vprintk(int flag, char *fmt, va_list ap) |
{ |
static char buf[1024]; /* DANGER !!!!! */ |
static char buf[2048]; /* DANGER !!!!! */ |
SYS_FLAGS f; |
int level; |
int result; |
result=sscanf(fmt,"<%i>",&level); |
if (result==1) { |
level = NO_LEVEL; |
if (*fmt == '<' && *(fmt+2) == '>') |
level = *(fmt+1) - '0'; |
if (level != NO_LEVEL) { |
if (level<LOG_EMERG||level>LOG_DEBUG) level=LOG_INFO; |
fmt+=3; |
} else { |
level=LOG_INFO; |
} |
if (level<=printklevel) return 0; |
vsprintf(buf,(char*)fmt,ap); |
result=(strchr(fmt,'\n')!=NULL); |
f=kern_fsave(); |
if (level != NO_LEVEL) |
cprintf("[%s] %s",levelname[level],buf); |
/* if we called printk, and the string does not have a \n in it, add it */ |
if ((!flag)&&(!result)) cprintf("\n"); |
else |
cprintf("%s",buf); |
kern_frestore(f); |
return 0; |
/shark/trunk/kernel/modules/edf.c |
---|
20,11 → 20,11 |
/** |
------------ |
CVS : $Id: edf.c,v 1.9 2003-12-10 16:55:00 giacomo Exp $ |
CVS : $Id: edf.c,v 1.10 2004-01-08 20:10:41 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.9 $ |
Last update: $Date: 2003-12-10 16:55:00 $ |
Revision: $Revision: 1.10 $ |
Last update: $Date: 2004-01-08 20:10:41 $ |
------------ |
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,p,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); |
372,7 → 372,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,p,l); |
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,3,proc_table[p].context,l); |
break; |
391,7 → 391,7 |
if (proc_table[p].status == EDF_IDLE) |
proc_table[p].status = EDF_WAIT; |
TRACER_LOGEVENT(FTrace_EVT_task_disable,3,p,l); |
TRACER_LOGEVENT(FTrace_EVT_task_disable,3,proc_table[p].context,l); |
break; |
493,8 → 493,6 |
lev = (EDF_level_des *)level_table[l]; |
printk(" lev=%d\n",(int)lev); |
/* fill the standard descriptor */ |
lev->l.private_insert = EDF_private_insert; |
lev->l.private_extract = EDF_private_extract; |
/shark/trunk/kernel/modules/pc.c |
---|
20,11 → 20,11 |
/** |
------------ |
CVS : $Id: pc.c,v 1.6 2003-11-06 09:42:23 giacomo Exp $ |
CVS : $Id: pc.c,v 1.7 2004-01-08 20:10:41 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.6 $ |
Last update: $Date: 2003-11-06 09:42:23 $ |
Revision: $Revision: 1.7 $ |
Last update: $Date: 2004-01-08 20:10:41 $ |
------------ |
Priority Ceiling protocol. see pc.h for more details... |
61,6 → 61,8 |
#include <kernel/var.h> |
#include <kernel/func.h> |
#include <tracer.h> |
typedef struct PC_mutexstruct_t PC_mutex_t; |
/* The PC resource level descriptor */ |
294,6 → 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); |
kern_context_load(proc_table[exec_shadow].context); |
/* ... and reaquire the cli() before the test... */ |
404,6 → 407,7 |
}*/ |
scheduler(); |
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.6 2003-12-10 16:55:00 giacomo Exp $ |
CVS : $Id: posix.c,v 1.7 2004-01-08 20:10:41 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.6 $ |
Last update: $Date: 2003-12-10 16:55:00 $ |
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,3,p,l); |
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,3,proc_table[p].context,l); |
return 0; |
} |
335,8 → 335,6 |
lev = (POSIX_level_des *)level_table[l]; |
printk(" lev=%d\n",(int)lev); |
/* fill the standard descriptor */ |
lev->l.public_scheduler = POSIX_public_scheduler; |
lev->l.public_create = POSIX_public_create; |
/shark/trunk/kernel/modules/srp.c |
---|
20,11 → 20,11 |
/** |
------------ |
CVS : $Id: srp.c,v 1.5 2003-11-06 09:42:23 giacomo Exp $ |
CVS : $Id: srp.c,v 1.6 2004-01-08 20:10:42 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.5 $ |
Last update: $Date: 2003-11-06 09:42:23 $ |
Revision: $Revision: 1.6 $ |
Last update: $Date: 2004-01-08 20:10:42 $ |
------------ |
Stack Resource Policy. see srp.h for general details... |
146,6 → 146,8 |
#include <kernel/var.h> |
#include <kernel/func.h> |
#include <tracer.h> |
typedef struct SRP_mutexstruct_t SRP_mutex_t; |
/* The SRP resource level descriptor */ |
718,6 → 720,7 |
} |
scheduler(); |
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.5 2003-12-10 16:55:01 giacomo Exp $ |
CVS : $Id: rr2.c,v 1.6 2004-01-08 20:10:42 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.5 $ |
Last update: $Date: 2003-12-10 16:55:01 $ |
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,3,p,l); |
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,3,proc_table[p].context,l); |
return 0; |
} |
288,8 → 288,6 |
lev = (RR2_level_des *)level_table[l]; |
printk(" lev=%d\n",(int)lev); |
/* fill the standard descriptor */ |
lev->l.public_scheduler = RR2_public_scheduler; |
lev->l.public_create = RR2_public_create; |
/shark/trunk/kernel/modules/hardcbs.c |
---|
540,8 → 540,6 |
lev = (HCBS_level_des *)level_table[l]; |
printk(" lev=%d\n",(int)lev); |
/* fill the standard descriptor */ |
if (flags & HCBS_ENABLE_GUARANTEE) |
lev->l.public_guarantee = HCBS_public_guarantee; |
/shark/trunk/kernel/modules/ds.c |
---|
20,11 → 20,11 |
/** |
------------ |
CVS : $Id: ds.c,v 1.5 2003-12-10 16:54:59 giacomo Exp $ |
CVS : $Id: ds.c,v 1.6 2004-01-08 20:10:41 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.5 $ |
Last update: $Date: 2003-12-10 16:54:59 $ |
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,3,p,l); |
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,3,proc_table[p].context,l); |
return 0; |
} |
430,8 → 430,6 |
lev = (DS_level_des *)level_table[l]; |
printk(" lev=%d\n",(int)lev); |
/* fill the standard descriptor */ |
if (flags & DS_ENABLE_BACKGROUND) |
/shark/trunk/kernel/modules/cbs.c |
---|
20,11 → 20,11 |
/** |
------------ |
CVS : $Id: cbs.c,v 1.8 2003-12-10 16:54:59 giacomo Exp $ |
CVS : $Id: cbs.c,v 1.9 2004-01-08 20:10:40 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.8 $ |
Last update: $Date: 2003-12-10 16:54:59 $ |
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,3,p,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,3,p,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,3,p,l); |
TRACER_LOGEVENT(FTrace_EVT_task_disable,3,proc_table[p].context,l); |
break; |
551,8 → 551,6 |
lev = (CBS_level_des *)level_table[l]; |
printk(" lev=%d\n",(int)lev); |
/* fill the standard descriptor */ |
if (flags & CBS_ENABLE_GUARANTEE) |
lev->l.public_guarantee = CBS_public_guarantee; |
/shark/trunk/kernel/modules/pi.c |
---|
20,11 → 20,11 |
/** |
------------ |
CVS : $Id: pi.c,v 1.5 2003-11-06 09:42:23 giacomo Exp $ |
CVS : $Id: pi.c,v 1.6 2004-01-08 20:10:41 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.5 $ |
Last update: $Date: 2003-11-06 09:42:23 $ |
Revision: $Revision: 1.6 $ |
Last update: $Date: 2004-01-08 20:10:41 $ |
------------ |
Priority Inhertitance protocol. see pi.h for more details... |
62,6 → 62,8 |
#include <kernel/var.h> |
#include <kernel/func.h> |
#include <tracer.h> |
/* The PI resource level descriptor */ |
typedef struct { |
mutex_resource_des m; /*+ the mutex interface +*/ |
196,6 → 198,7 |
// kern_printf("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"); |
/* ... call the scheduler... */ |
scheduler(); |
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... */ |
289,6 → 292,7 |
}*/ |
scheduler(); |
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.6 2003-12-10 16:55:00 giacomo Exp $ |
CVS : $Id: rm.c,v 1.7 2004-01-08 20:10:42 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.6 $ |
Last update: $Date: 2003-12-10 16:55:00 $ |
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,3,p,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); |
133,7 → 133,6 |
(void *)p); |
//printk("(d%d idle priority set to %d)",p,proc_table[p].priority ); |
event_need_reschedule(); |
printk("el%d|",p); |
break; |
case RM_WAIT: |
336,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,p,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... ) */ |
439,8 → 438,6 |
lev = (RM_level_des *)level_table[l]; |
printk(" lev=%d\n",(int)lev); |
/* fill the standard descriptor */ |
lev->l.private_insert = RM_private_insert; |
lev->l.private_extract = RM_private_extract; |
/shark/trunk/kernel/modules/rrsoft.c |
---|
20,11 → 20,11 |
/** |
------------ |
CVS : $Id: rrsoft.c,v 1.6 2003-12-10 16:55:01 giacomo Exp $ |
CVS : $Id: rrsoft.c,v 1.7 2004-01-08 20:10:42 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.6 $ |
Last update: $Date: 2003-12-10 16:55:01 $ |
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,3,p,l); |
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,3,proc_table[p].context,l); |
return 0; |
} |
396,8 → 396,6 |
lev = (RRSOFT_level_des *)level_table[l]; |
printk(" lev=%d\n",(int)lev); |
/* fill the standard descriptor */ |
lev->l.public_scheduler = RRSOFT_public_scheduler; |
lev->l.public_create = RRSOFT_public_create; |
/shark/trunk/kernel/modules/ps.c |
---|
20,11 → 20,11 |
/** |
------------ |
CVS : $Id: ps.c,v 1.5 2003-12-10 16:55:00 giacomo Exp $ |
CVS : $Id: ps.c,v 1.6 2004-01-08 20:10:41 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.5 $ |
Last update: $Date: 2003-12-10 16:55:00 $ |
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,3,p,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.6 2003-12-10 16:55:00 giacomo Exp $ |
CVS : $Id: rr.c,v 1.7 2004-01-08 20:10:42 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.6 $ |
Last update: $Date: 2003-12-10 16:55:00 $ |
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,3,p,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); |
320,8 → 320,6 |
lev = (RR_level_des *)level_table[l]; |
printk(" lev=%d\n",(int)lev); |
/* fill the standard descriptor */ |
lev->l.public_scheduler = RR_public_scheduler; |
lev->l.public_create = RR_public_create; |
/shark/trunk/kernel/modules/sem.c |
---|
20,11 → 20,11 |
/** |
------------ |
CVS : $Id: sem.c,v 1.7 2003-12-19 10:01:54 giacomo Exp $ |
CVS : $Id: sem.c,v 1.8 2004-01-08 20:10:42 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.7 $ |
Last update: $Date: 2003-12-19 10:01:54 $ |
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,3,*s,exec_shadow); |
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,3,*s,exec_shadow); |
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,3,*s,exec_shadow); |
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,3,*s,exec_shadow); |
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,3,*s,exec_shadow); |
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,3,*s,exec_shadow); |
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,3,*s,exec_shadow); |
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,3,*s,exec_shadow); |
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.5 2003-12-10 16:55:01 giacomo Exp $ |
CVS : $Id: ss.c,v 1.6 2004-01-08 20:10:42 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.5 $ |
Last update: $Date: 2003-12-10 16:55:01 $ |
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,3,p,l); |
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,3,proc_table[p].context,l); |
return 0; |
} |
947,10 → 947,10 |
/* request an entry in the level_table */ |
l = level_alloc_descriptor(sizeof(SS_level_des)); |
printk("SS_register_level\n"); |
lev = (SS_level_des *)level_table[l]; |
printk(" lev=%d\n",(int)lev); |
/* fill the standard descriptor */ |
if (flags & SS_ENABLE_BACKGROUND) |
/shark/trunk/kernel/modules/tbs.c |
---|
20,11 → 20,11 |
/** |
------------ |
CVS : $Id: tbs.c,v 1.5 2003-12-10 16:55:01 giacomo Exp $ |
CVS : $Id: tbs.c,v 1.6 2004-01-08 20:10:42 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.5 $ |
Last update: $Date: 2003-12-10 16:55:01 $ |
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,3,p,l); |
TRACER_LOGEVENT(FTrace_EVT_task_end_cycle,3,proc_table[p].context,l); |
return 0; |
} |
368,8 → 368,6 |
lev = (TBS_level_des *)level_table[l]; |
printk(" lev=%d\n",(int)lev); |
/* fill the standard descriptor */ |
if (flags & TBS_ENABLE_GUARANTEE) |
lev->l.public_guarantee = TBS_public_guarantee; |
/shark/trunk/kernel/modules/dummy.c |
---|
20,11 → 20,11 |
/** |
------------ |
CVS : $Id: dummy.c,v 1.4 2003-01-07 17:07:50 pj Exp $ |
CVS : $Id: dummy.c,v 1.5 2004-01-08 20:10:41 giacomo Exp $ |
File: $File$ |
Revision: $Revision: 1.4 $ |
Last update: $Date: 2003-01-07 17:07:50 $ |
Revision: $Revision: 1.5 $ |
Last update: $Date: 2004-01-08 20:10:41 $ |
------------ |
This file contains the Dummy scheduling module |
160,7 → 160,7 |
LEVEL l; /* the level that we register */ |
dummy_level_des *lev; /* for readableness only */ |
printk("Inside dummy_register_level\n"); |
printk("dummy_register_level\n"); |
/* request an entry in the level_table */ |
l = level_alloc_descriptor(sizeof(dummy_level_des)); |
167,8 → 167,6 |
lev = (dummy_level_des *)level_table[l]; |
printk(" lev=%d\n",(int)lev); |
/* fill the standard descriptor */ |
lev->l.public_scheduler = dummy_public_scheduler; |
lev->l.public_guarantee = NULL; |
180,8 → 178,6 |
see also dummy_level_accept_model,dummy_create */ |
lev->dummy = -1; |
printk("\tPosto dummy_create\n"); |
sys_atrunlevel(dummy_create,(void *) l, RUNLEVEL_INIT); |
return l; |