Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 501 → Rev 502

/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,1,(int)(b),0);
TRACER_LOGEVENT(FTrace_EVT_server_replenish,0,(unsigned int)(b));
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,1,(int)(b),0);
TRACER_LOGEVENT(FTrace_EVT_server_reclaiming,0,(unsigned int)b);
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,1,(int)(b),0);
TRACER_LOGEVENT(FTrace_EVT_server_active,0,(unsigned int)b);
 
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,1,(int)(b),0);
TRACER_LOGEVENT(FTrace_EVT_server_exhaust,0,(unsigned int)(b));
b->flags = GRUBSTAR_NOACTIVE;
}
 
312,7 → 312,7
b->last_reclaiming = 0;
/* Tracer */
TRACER_LOGEVENT(FTrace_EVT_server_replenish,1,(int)(b),0);
TRACER_LOGEVENT(FTrace_EVT_server_replenish,0,(unsigned int)(b));
 
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,3,(int)(&lev->b[lev->tb[exec]]),lev->b[lev->tb[exec]].last_reclaiming);
TRACER_LOGEVENT(FTrace_EVT_server_using_rec,(unsigned short int)lev->b[lev->tb[exec]].last_reclaiming,(unsigned int)(&lev->b[lev->tb[exec]]));
 
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,1,(int)(b),0);
TRACER_LOGEVENT(FTrace_EVT_server_reclaiming,0,(unsigned int)(b));
b->flags = GRUBSTAR_RECLAIMING;
lev->Uf -= b->Ub;
 
645,8 → 645,6
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
678,8 → 676,6
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;
 
}