WebSVN - shark - Path Comparison - /shark/trunk/ports/ Rev 340 and /shark/trunk/ports/ Rev 341

Ignore whitespace Rev 340 → Rev 341

/shark/trunk/ports/first/include/mpegstar.h
51,6 → 51,7

int MPEGSTAR_rescale(int budget, TIME Q, TIME T);
int MPEGSTAR_get_remain_capacity(int budget);
int MPEGSTAR_get_last_reclaiming(void);

#endif

 /shark/trunk/ports/first/modules/mpegstar.c
 ,6 → 84,7
   if (m->pclass != HARD_PCLASS) return -1;
   if (m->level != 0 && m->level != l) return -1;
+  if (lev->current != NIL) return -1;
   lev->current = p;
 ,8 → 161,6
     /* Task EndCycle */
     case (long)(NULL):
-      lev->current = NIL;
       #ifdef MPEGSTAR_DEBUG
         kern_printf("(MS:EndCycle:%d)",p);
       #endif
 ,7 → 191,13
 static void MPEGSTAR_public_end(LEVEL l, PID p)
 {
   MPEGSTAR_level_des *lev = (MPEGSTAR_level_des *)(level_table[l]);
+  #ifdef MPEGSTAR_DEBUG
+    kern_printf("(MS:End:%d)", p);
+  #endif
+  lev->current = NIL;                                                                                                          proc_table[p].status = FREE;
 }
 /* Registration functions */
 ,10 → 282,10
 int MPEGSTAR_get_remain_capacity(int budget)
 {
-  LEVEL l = SERVER_get_local_scheduler_level_from_budget(fsf_get_server_level(),budget);
-  MPEGSTAR_level_des *lev = (MPEGSTAR_level_des *)(level_table[l]);
-  SERVER_get_remain_capacity(lev->scheduling_level,budget);
-  return 0;
+  return SERVER_get_remain_capacity(fsf_get_server_level(),budget);
 }
+int MPEGSTAR_get_last_reclaiming()
+{
+  return SERVER_get_last_reclaiming(fsf_get_server_level(),exec_shadow);
+}

/shark/trunk/ports/first/modules/grubstar.c
654,6 → 654,7
lev->b[budget].Q = Q;
lev->b[budget].T = T;
lev->b[budget].Ub = (MAX_BANDWIDTH / T) * Q;
lev->b[budget].avail = Q;
lev->U += lev->b[budget].Ub;

return 0;