Remove rounding error in PoolP.nc, fix async warnings in BitVectorC.

[tinyos-2.x.git] / tos / system / PoolP.nc

diff --git a/tos/system/PoolP.nc b/tos/system/PoolP.nc
index 960b03baea14a18373b17a647a3be8d86d122161..9011d6cfd273898c93c904d0fde6c6a4e3fffd1f 100644 (file)
--- a/tos/system/PoolP.nc
+++ b/tos/system/PoolP.nc
@@ -46,6 +46,7 @@
  *
  *  @author Philip Levis
  *  @author Kyle Jamieson
+ *  @author Geoffrey Mainland
  *  @date   $Date$
  */
 
@@ -58,7 +59,7 @@ generic module PoolP(typedef pool_t, uint8_t size) {
 implementation {
   uint8_t free;
   uint8_t index;
-  pool_t* queue[size];
+  pool_t* ONE_NOK queue[size];
   pool_t pool[size];
 
   command error_t Init.init() {
@@ -72,9 +73,11 @@ implementation {
   }
   
   command bool Pool.empty() {
+    dbg("PoolP", "%s size is %i\n", __FUNCTION__, (int)free);
     return free == 0;
   }
   command uint8_t Pool.size() {
+    dbg("PoolP", "%s size is %i\n", __FUNCTION__, (int)free);
     return free;
   }
     
@@ -87,7 +90,11 @@ implementation {
       pool_t* rval = queue[index];
       queue[index] = NULL;
       free--;
-      index = (index + 1) % size;
+      index++;
+      if (index == size) {
+        index = 0;
+      }
+      dbg("PoolP", "%s size is %i\n", __FUNCTION__, (int)free);
       return rval;
     }
     return NULL;
@@ -98,9 +105,13 @@ implementation {
       return FAIL;
     }
     else {
-      uint8_t emptyIndex = (index + free) % size;
+      uint16_t emptyIndex = (index + free);
+      if (emptyIndex >= size) {
+        emptyIndex -= size;
+      }
       queue[emptyIndex] = newVal;
       free++;
+      dbg("PoolP", "%s size is %i\n", __FUNCTION__, (int)free);
       return SUCCESS;
     }
   }