Fix unused

Author: joente

src/util/imap.c

@@ -739,33 +739,38 @@ vec_t * imap_vec_ref(imap_t * imap)
 static uint64_t imap__unused_id(imap_node_t * node, uint64_t max)
 {
     imap_node_t * nd = node->nodes;
-    size_t i, n, m, r;
+    size_t i, n, m, r, low;
 
     if (node->key != IMAP_NODE_SZ)
-        return (node->key+1) % IMAP_NODE_SZ;
+        // it is not enough to test just for free, it must be the lowest
+        // because a higher value might be out the range of max
+        return (node->key % IMAP_NODE_SZ) == 0 ? 1 : 0;
 
     for (i = 0; i < IMAP_NODE_SZ; ++i, ++nd)
         if (!nd->data)
             return i;  /* we don't care if larger than max */
 
     n = IMAP_NODE_SZ + IMAP_NODE_SZ;
     n = n < max ? n : max;
-    m = max / IMAP_NODE_SZ - 1;
+    m = max / IMAP_NODE_SZ;
     nd = node->nodes;
-
+    low = max;
     for (i = IMAP_NODE_SZ; i < n; ++i, ++nd)
     {
         if (!nd->nodes)
             return i;
 
         if ((r = imap__unused_id(nd, m)) < m)
         {
+            if (r == 0)
+                return i;
             r *= IMAP_NODE_SZ;
             r += i;
-            return r;
+            if (r < low)
+                low = r;
         }
     }
-    return max;
+    return low;
 }
 
 /*

test/test_imap/test_imap.c

@@ -1,40 +1,25 @@
 #include "../test.h"
 #include <util/imap.h>
 
-static const unsigned int num_batches = 5;
-static const unsigned int num_entries = 8;
-
-
 int main()
 {
     test_start("imap");
 
     imap_t * imap = imap_create();
     uint64_t id = 0;
+    uint64_t x = 0;
+    uint64_t t = 0x1fff;
 
     _assert (imap);
 
-    /* test adding values */
-    for (size_t j = 0; j < num_batches; ++j)
-    {
-        for (size_t i = 1; i <= num_entries ; ++i)
-        {
-            id = (j*100) + i + (i*j);
-            _assert (imap_add(
-                imap, id,
-                (void *) (uintptr_t)
-                &id) == IMAP_SUCCESS);
-        }
-    }
-
-    _assert (imap->n == num_batches * num_entries);
-
-    while ((id = imap_unused_id(imap, 0x1000)) != 0x1000)
+    while ((id = imap_unused_id(imap, t)) != t)
     {
+        _assert (x < t);
+        _assert (id < t);
         _assert (imap_add(imap, id, (void *) (uintptr_t) &id) == IMAP_SUCCESS);
+        x += 1;
     }
-
-    _assert (imap->n == 0x1000);
+    _assert (imap->n == t);
 
     imap_destroy(imap, NULL);