Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 828 → Rev 829

/shark/trunk/ports/first/modules/pistar.c
20,11 → 20,11
 
/**
------------
CVS : $Id: pistar.c,v 1.7 2004-09-07 09:46:14 trimarchi Exp $
CVS : $Id: pistar.c,v 1.8 2004-09-08 16:51:34 giacomo Exp $
 
File: $File$
Revision: $Revision: 1.7 $
Last update: $Date: 2004-09-07 09:46:14 $
Revision: $Revision: 1.8 $
Last update: $Date: 2004-09-08 16:51:34 $
------------
 
Priority Inhertitance protocol. see pi.h for more details...
179,6 → 179,9
fsf_server_id_t server;
 
f = kern_fsave();
 
TRACER_LOGEVENT(FTrace_EVT_set_mutex_lock,(unsigned short int)proc_table[exec_shadow].context,(unsigned int)m);
 
//kern_printf("(PISTAR lock)");
p = (PISTAR_mutex_t *)m->opt;
if (!p) {
210,7 → 213,6
kern_cli();
}
fsf_get_server(&server, exec_shadow);
if (server==-1) kern_printf("error");
if (fsf_get_remain_budget(server)>wcet) cond=0;
else {
SERVER_disable_server(fsf_get_server_level(),server);
/shark/trunk/ports/first/modules/grubstar.c
773,12 → 773,11
int GRUBSTAR_get_remain_capacity(LEVEL l, int budget)
{
struct timespec actual,ty;
TIME tx;
int tx;
GRUBSTAR_level_des *lev = (GRUBSTAR_level_des *)(level_table[l]);
kern_gettime(&actual);
SUBTIMESPEC(&actual, &lev->cap_lasttime, &ty);
SUBTIMESPEC(&actual, &schedule_time, &ty);
tx = TIMESPEC2USEC(&ty);
 
// the remain capacity is from the first dispatch so is less then
// actual capacity
return (lev->b[budget].avail-tx);
833,7 → 832,7
/* force a hard reservation event */
avail_budget=lev->b[lev->tb[exec]].avail;
lev->b[lev->tb[exec]].flags = GRUBSTAR_NOACTIVE;
 
//kern_printf("(GS DS %d)", exec);
/* save the unused capacity */
spare=avail_budget+lev->b[lev->tb[exec]].avail;
if (spare<=0) spare=0;