Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 896 → Rev 897

/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)),
178,7 → 178,10
bandwidth_t current_bandwidth,U;
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);