/shark/trunk/ports/first/first-contract.c |
---|
157,8 → 157,8 |
{ |
if (!contract) return FSF_ERR_BAD_ARGUMENT; |
if ((d_equals_t==true && deadline != FSF_NULL_DEADLINE) || |
(d_equals_t==false && deadline == FSF_NULL_DEADLINE)) |
if ((d_equals_t==false && deadline != FSF_NULL_DEADLINE) || |
(d_equals_t==true && deadline == FSF_NULL_DEADLINE)) |
return FSF_ERR_BAD_ARGUMENT; |
if (TIMESPEC_A_GT_B(deadline, &contract->period_max)) |
return FSF_ERR_BAD_ARGUMENT; |
/shark/trunk/ports/first/server-task.c |
---|
34,7 → 34,7 |
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
* |
* |
* CVS : $Id: server-task.c,v 1.11 2004-11-24 09:06:36 trimarchi Exp $ |
* CVS : $Id: server-task.c,v 1.12 2004-11-24 10:24:43 trimarchi Exp $ |
*/ |
#include "ll/i386/64bit.h" |
151,7 → 151,7 |
#ifdef FSF_DEBUG |
kern_printf("(1 - Q %ld T %ld)", server_list[i].actual_budget, server_list[i].actual_period); |
#endif |
if (server_list[i].d_equals_t == true) |
if (server_list[i].d_equals_t == false) |
adjust_SERVER_budget(server_list[i].server,server_list[i].Cmin, T, T); |
else |
adjust_SERVER_budget(server_list[i].server,server_list[i].Cmin, T, server_list[i].deadline); |
164,7 → 164,7 |
kern_printf("(2 - Q %ld T %ld)", server_list[i].actual_budget, server_list[i].actual_period); |
#endif |
if (server_list[i].d_equals_t == true) |
if (server_list[i].d_equals_t == false) |
adjust_SERVER_budget(server_list[i].server,server_list[i].Cmin, server_list[i].Tmin, server_list[i].Tmin); |
else |
adjust_SERVER_budget(server_list[i].server,server_list[i].Cmin, server_list[i].Tmin, server_list[i].deadline); |
/shark/trunk/ports/first/modules/grubstar.c |
---|
336,9 → 336,9 |
JOB_TASK_MODEL job; |
if ( TIMESPEC_A_LT_B(&b->dline, &schedule_time)) { |
// #ifdef GRUBSTAR_DEBUG |
#ifdef GRUBSTAR_DEBUG |
kern_printf("(GS:Eli:%d)",p); |
// #endif |
#endif |
if (lev->cap_lev!=NIL) { |
kern_event_delete(lev->cap_lev); |
lev->cap_lev=NIL; |
/shark/trunk/ports/first/first-server.c |
---|
139,7 → 139,7 |
break; |
} |
if (contract->d_equals_t == true) { |
if (contract->d_equals_t == false) { |
*budget = SERVER_setbudget(fsf_server_level, |
TIMESPEC2USEC(&(contract->budget_min)), |
TIMESPEC2USEC(&(contract->period_max)), |
179,6 → 179,9 |
TIME T,Q; |
#ifdef FSF_DEBUG |
kern_printf("(GA TEST)"); |
#endif |
T=TIMESPEC2USEC(&(contract->period_max)); |
Q=TIMESPEC2USEC(&(contract->budget_min)); |
186,7 → 189,7 |
/* The current bandwidth is the min bandwidth */ |
current_bandwidth=SERVER_return_bandwidth(fsf_server_level); |
if (fsf_max_bw>=current_bandwidth+U) return -1; |
if (fsf_max_bw<current_bandwidth+U) return -1; |
return 0; |
215,12 → 218,12 |
mul32div32to32(MAX_BANDWIDTH,Q,T,server_list[i].Umin); |
server_list[i].U=server_list[i].Umin; |
if (contract->d_equals_t == true) { |
if (contract->d_equals_t == false) { |
server_list[i].deadline = 0; |
server_list[i].d_equals_t = true; |
server_list[i].d_equals_t = false; |
} else { |
server_list[i].deadline = TIMESPEC2USEC(&contract->deadline);; |
server_list[i].d_equals_t = false; |
server_list[i].d_equals_t = true; |
} |
server_list[i].Qs = contract->quality; |
896,7 → 899,7 |
kern_printf("(1 - Q %ld T %ld)", server_list[i].actual_budget, server_list[i].actual_period); |
#endif |
if (server_list[i].d_equals_t == true) |
if (server_list[i].d_equals_t == false) |
adjust_SERVER_budget(server_list[i].server,server_list[i].Cmin, T, T); |
else |
adjust_SERVER_budget(server_list[i].server,server_list[i].Cmin, T, server_list[i].deadline); |
909,7 → 912,7 |
kern_printf("(2 - Q %ld T %ld)", server_list[i].actual_budget, server_list[i].actual_period); |
#endif |
if (server_list[i].d_equals_t == true) |
if (server_list[i].d_equals_t == false) |
adjust_SERVER_budget(server_list[i].server,Q, server_list[i].Tmin, server_list[i].Tmin); |
else |
adjust_SERVER_budget(server_list[i].server,Q, server_list[i].Tmin, server_list[i].deadline); |