lib: Fix pool_sharding_test

The test was not correctly taking the correct size class. Moved the
select_size_class to the common header so tests can use it.

Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks>
Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>

3 files changed, 39 insertions, 71 deletions

diff --git a/src/lib/ssm/pool.c b/src/lib/ssm/pool.c
index 6829b217..e9a81688 100644
--- a/src/lib/ssm/pool.c
+++ b/src/lib/ssm/pool.c
@@ -165,29 +165,6 @@ static __inline__ void list_add_head(struct _ssm_list_head * head,
         STORE(&head->count, LOAD(&head->count) + 1);
 }
 
-static __inline__ int select_size_class(struct ssm_pool * pool,
-                                        size_t            len)
-{
-        size_t sz;
-        int    i;
-
-        assert(pool != NULL);
-
-        /* Total space needed: header + headspace + data + tailspace */
-        sz = sizeof(struct ssm_pk_buff) + SSM_PK_BUFF_HEADSPACE + len
-             + SSM_PK_BUFF_TAILSPACE;
-
-        for (i = 0; i < SSM_POOL_MAX_CLASSES; i++) {
-                struct _ssm_size_class * sc;
-
-                sc = &pool->hdr->size_classes[i];
-                if (sc->object_size > 0 && sz <= sc->object_size)
-                        return i;
-        }
-
-        return -1;
-}
-
 static __inline__ int find_size_class_for_offset(struct ssm_pool * pool,
                                                  size_t            offset)
 {
@@ -702,7 +679,7 @@ ssize_t ssm_pool_alloc(struct ssm_pool *     pool,
         assert(pool != NULL);
         assert(spb != NULL);
 
-        idx = select_size_class(pool, count);
+        idx = select_size_class(pool->hdr, count);
         if (idx >= 0)
                 return alloc_from_sc(pool, idx, count, ptr, spb);
 
@@ -720,7 +697,7 @@ ssize_t ssm_pool_alloc_b(struct ssm_pool *       pool,
         assert(pool != NULL);
         assert(spb != NULL);
 
-        idx = select_size_class(pool, count);
+        idx = select_size_class(pool->hdr, count);
         if (idx >= 0)
                 return alloc_from_sc_b(pool, idx, count, ptr, spb, abstime);
 
diff --git a/src/lib/ssm/ssm.h.in b/src/lib/ssm/ssm.h.in
index b9246c8b..4ac9a21b 100644
--- a/src/lib/ssm/ssm.h.in
+++ b/src/lib/ssm/ssm.h.in
@@ -164,6 +164,24 @@ struct _ssm_pool_hdr {
         struct _ssm_size_class  size_classes[SSM_POOL_MAX_CLASSES];
 };
 
+#define SSM_PK_BUFF_TOTALSPACE (SSM_PK_BUFF_HEADSPACE + SSM_PK_BUFF_TAILSPACE)
+static __inline__ int select_size_class(struct _ssm_pool_hdr * hdr,
+                                        size_t                 len)
+{
+        size_t sz;
+        int    i;
+
+        sz = sizeof(struct ssm_pk_buff) + SSM_PK_BUFF_TOTALSPACE + len;
+
+        for (i = 0; i < SSM_POOL_MAX_CLASSES; i++) {
+                struct _ssm_size_class * sc = &hdr->size_classes[i];
+                if (sc->object_size > 0 && sz <= sc->object_size)
+                        return i;
+        }
+
+        return -1;
+}
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/lib/ssm/tests/pool_sharding_test.c b/src/lib/ssm/tests/pool_sharding_test.c
index f2810c53..ec464a92 100644
--- a/src/lib/ssm/tests/pool_sharding_test.c
+++ b/src/lib/ssm/tests/pool_sharding_test.c
@@ -80,19 +80,13 @@ static int test_lazy_distribution(void)
                 goto fail_pool;
         }
 
-        /* Find the first size class with blocks */
-        sc_idx = -1;
-        for (i = 0; i < SSM_POOL_MAX_CLASSES; i++) {
-                if (hdr->size_classes[i].object_count > 0) {
-                        sc_idx = i;
-                        break;
-                }
-        }
-
+        /* Inspect the class that TEST_SIZE allocations will use */
+        sc_idx = select_size_class(hdr, TEST_SIZE);
         if (sc_idx < 0) {
-                printf("No size classes configured.\n");
+                printf("No size class fits TEST_SIZE=%d.\n", TEST_SIZE);
                 for (i = 0; i < SSM_POOL_MAX_CLASSES; i++) {
-                        printf("  Class %d: count=%zu\n", i,
+                        printf("  Class %d: object_size=%zu count=%zu\n", i,
+                               hdr->size_classes[i].object_size,
                                hdr->size_classes[i].object_count);
                 }
                 goto fail_pool;
@@ -137,7 +131,6 @@ static int test_shard_migration(void)
         ssize_t               off;
         int                   shard_idx;
         int                   sc_idx;
-        int                   i;
 
         TEST_START();
 
@@ -149,18 +142,11 @@ static int test_shard_migration(void)
 
         hdr = get_pool_hdr(pool);
 
-        /* Find the first size class with blocks */
-        sc_idx = -1;
-        for (i = 0; i < SSM_POOL_MAX_CLASSES; i++) {
-                if (hdr->size_classes[i].object_count > 0) {
-                        sc_idx = i;
-                        break;
-                }
-        }
-
+        /* Inspect the class that TEST_SIZE allocations will use */
+        sc_idx = select_size_class(hdr, TEST_SIZE);
         if (sc_idx < 0) {
-                printf("No size classes configured.\n");
-                goto fail;
+                printf("No size class fits TEST_SIZE=%d.\n", TEST_SIZE);
+                goto fail_pool;
         }
 
         sc = &hdr->size_classes[sc_idx];
@@ -209,7 +195,6 @@ static int test_fallback_stealing(void)
         size_t                total_free;
         size_t                i;
         int                   sc_idx;
-        int                   c;
 
         TEST_START();
 
@@ -221,18 +206,11 @@ static int test_fallback_stealing(void)
 
         hdr = get_pool_hdr(pool);
 
-        /* Find the first size class with blocks */
-        sc_idx = -1;
-        for (c = 0; c < SSM_POOL_MAX_CLASSES; c++) {
-                if (hdr->size_classes[c].object_count > 0) {
-                        sc_idx = c;
-                        break;
-                }
-        }
-
+        /* Inspect the class that TEST_SIZE allocations will use */
+        sc_idx = select_size_class(hdr, TEST_SIZE);
         if (sc_idx < 0) {
-                printf("No size classes configured.\n");
-                goto fail;
+                printf("No size class fits TEST_SIZE=%d.\n", TEST_SIZE);
+                goto fail_pool;
         }
 
         sc = &hdr->size_classes[sc_idx];
@@ -396,20 +374,15 @@ static int test_multiprocess_sharding(void)
         /* Verify blocks distributed across shards */
         hdr = get_pool_hdr(pool);
 
-        /* Find the first size class with blocks */
-        sc = NULL;
-        for (i = 0; i < SSM_POOL_MAX_CLASSES; i++) {
-                if (hdr->size_classes[i].object_count > 0) {
-                        sc = &hdr->size_classes[i];
-                        break;
-                }
-        }
-
-        if (sc == NULL) {
-                printf("No size classes configured.\n");
+        /* Inspect the class that TEST_SIZE allocations used */
+        i = select_size_class(hdr, TEST_SIZE);
+        if (i < 0) {
+                printf("No size class fits TEST_SIZE=%d.\n", TEST_SIZE);
                 goto fail_pool;
         }
 
+        sc = &hdr->size_classes[i];
+
         /* After children allocate and free, blocks should be in shards
          * (though exact distribution depends on PID values)
          */