WebSVN - shark - Path Comparison - /shark/trunk/ports Rev 384 and /shark/trunk/ports Rev 388

Ignore whitespace Rev 384 → Rev 388

 /shark/trunk/ports/first/modules/edfstar.c
 ,8 → 639,6
   lev = (EDFSTAR_level_des *)level_table[l];
-  printk("    lev=%d\n",(int)lev);
   /* fill the standard descriptor */
   lev->l.private_insert   = EDFSTAR_private_insert;
   lev->l.private_extract  = EDFSTAR_private_extract;

 /shark/trunk/ports/first/modules/rmstar.c
 ,8 → 564,6
   lev = (RMSTAR_level_des *)level_table[l];
-  printk("    lev=%d\n",(int)lev);
   /* fill the standard descriptor */
   lev->l.private_insert   = RMSTAR_private_insert;
   lev->l.private_extract  = RMSTAR_private_extract;

 /shark/trunk/ports/first/modules/grubstar.c
 ,7 → 112,7
   TRACER_LOGEVENT(FTrace_EVT_server_replenish,1,(int)(b),0);
   if (b->flags==GRUBSTAR_RECLAIMING && b->avail>0)
-    lev->Uf += b->Ub;
+    if (lev->Uf < lev->U) lev->Uf += b->Ub;
   if (b->avail > 0) b->flags = GRUBSTAR_ACTIVE;
 ,7 → 209,7
   }
   if (b->flags==GRUBSTAR_RECLAIMING)
-    lev->Uf += b->Ub;
+    if (lev->Uf < lev->U) lev->Uf += b->Ub;
   b->flags=GRUBSTAR_ACTIVE;
 ,6 → 252,9
   b->avail -= tx - b->last_reclaiming;
+  if (b->last_reclaiming > 0)
+    TRACER_LOGEVENT(FTrace_EVT_server_using_rec,3,(int)(b),b->last_reclaiming);
   #ifdef GRUBSTAR_DEBUG
     kern_printf("(GS:Cap p%d av=%d tx=%d rec=%d)", p, b->avail,(int)tx,b->last_reclaiming);
   #endif
 ,7 → 322,7
       TRACER_LOGEVENT(FTrace_EVT_server_replenish,1,(int)(b),0);
       if (b->flags == GRUBSTAR_RECLAIMING) {
-        lev->Uf += b->Ub;
+        if (lev->Uf < lev->U) lev->Uf += b->Ub;
       }
       b->flags = GRUBSTAR_ACTIVE;