tidy up the race around size and seen live items

chrisvest · May 31, 2024 · 508526e · 508526e
1 parent 6a4f7cc
commit 508526e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/src/main/java/stormpot/BAllocThread.java b/src/main/java/stormpot/BAllocThread.java
@@ -396,12 +396,14 @@ int allocatedSize() {
   }
 
   int inUse() {
-    int inUse = size - live.size(); // slots not in live are in thread locals?
+    int inUse = 0;
+    int liveSize = 0;
     for (BSlot<T> slot: live) {
+      liveSize++;
       if (slot.isClaimedOrThreadLocal()) {
         inUse++;
       }
     }
-    return inUse;
-  }  
+    return size - liveSize + inUse;
+  } 
 }
diff --git a/src/main/java/stormpot/DirectAllocationController.java b/src/main/java/stormpot/DirectAllocationController.java
@@ -123,12 +123,14 @@ public int allocatedSize() {
   }
 
   int inUse() {
-    int inUse = size - live.size();
+    int inUse = 0;
+    int liveSize = 0;
     for (BSlot<T> slot: live) {
+      liveSize++;
       if (slot.isClaimedOrThreadLocal()) {
         inUse++;
       }
     }
-    return inUse;
+    return size - liveSize + inUse;
   }  
 }
diff --git a/src/main/java/stormpot/InlineAllocationController.java b/src/main/java/stormpot/InlineAllocationController.java
@@ -369,12 +369,14 @@ public int allocatedSize() {
   }
 
   int inUse() {
-    int inUse = size - live.size();
+    int inUse = 0;
+    int liveSize = 0;
     for (BSlot<T> slot: live) {
+      liveSize++;
       if (slot.isClaimedOrThreadLocal()) {
         inUse++;
       }
     }
-    return inUse;
-  }
+    return size - liveSize + inUse;
+  } 
 }