pkmem: handle accessing uninitialized debug blocks

2 files changed, 90 insertions, 3 deletions

diff --git a/test/pkmem.c b/test/pkmem.c
index ad95899..36bf0eb 100644
--- a/test/pkmem.c
+++ b/test/pkmem.c
@@ -113,5 +113,72 @@ int main(int argc, char *argv[])
 		teardown();
 	}
 
+	// expand buckets
+	{
+		// spinup_w_instr();
+		spinup();
+
+		/*
+		 * [00-47] (48) ptr1
+		 * [48-XX] ( 1) HEAD
+		 */
+		void *ptr1 = pk_new_bkt(48, 1, mt.bkt1);
+		(void)ptr1;
+
+		if ((void*)&mt.bkt1->data[0] != ptr1) exit(1);
+		if (mt.bkt1->alloc_count != 1) exit(1);
+		if (mt.bkt1->head != 48) exit(1);
+		if (mt.bkt1->debug_head_l != 1) exit(1);
+		if (mt.bkt1->debug_head_r != 1) exit(1);
+		if (mt.bkt1->block_head_l != 0) exit(1);
+		if (mt.bkt1->block_head_r != 0) exit(1);
+
+		/*
+		 * [00-47] (48) ptr1
+		 * [   48] ( 1) ptr2
+		 * [49-XX] ( 1) HEAD
+		 */
+		void *ptr2 = pk_new_bkt(1, 1, mt.bkt1);
+
+		if ((void*)(&mt.bkt1->data[0]+48) != ptr2) exit(1);
+		if (mt.bkt1->alloc_count != 2) exit(1);
+		if (mt.bkt1->head != 49) exit(1);
+		if (mt.bkt1->debug_head_l != 2) exit(1);
+		if (mt.bkt1->debug_head_r != 2) exit(1);
+		if (mt.bkt1->block_head_l != 0) exit(1);
+		if (mt.bkt1->block_head_r != 0) exit(1);
+
+		/*
+		 * [00-47] (48) ptr1
+		 * [48-XX] ( 1) HEAD
+		 */
+		pk_delete_bkt(ptr2, 1, mt.bkt1);
+
+		if (mt.bkt1->alloc_count != 1) exit(1);
+		if (mt.bkt1->head != 48) exit(1);
+		if (mt.bkt1->debug_head_l != 1) exit(1);
+		if (mt.bkt1->debug_head_r != 2) exit(1);
+		if (mt.bkt1->block_head_l != 0) exit(1);
+		if (mt.bkt1->block_head_r != 0) exit(1);
+
+		/*
+		 * [00-47] (48) ptr1
+		 * [   48] ( 1) ptr2
+		 * [49-XX] ( 1) HEAD
+		 */
+		ptr2 = pk_new_bkt(1, 1, mt.bkt1);
+
+		if ((void*)(&mt.bkt1->data[0]+48) != ptr2) exit(1);
+		if (mt.bkt1->alloc_count != 2) exit(1);
+		if (mt.bkt1->head != 49) exit(1);
+		if (mt.bkt1->debug_head_l != 2) exit(1);
+		if (mt.bkt1->debug_head_r != 2) exit(1);
+		if (mt.bkt1->block_head_l != 0) exit(1);
+		if (mt.bkt1->block_head_r != 0) exit(1);
+
+		PK_LOGV_INF("%s: %s\n", __FILE__, "handles free last + new");
+		teardown();
+	}
+
 	return 0;
 }
diff --git a/test/pkmem.cpp b/test/pkmem.cpp
index 3a2b425..52b393b 100644
--- a/test/pkmem.cpp
+++ b/test/pkmem.cpp
@@ -71,7 +71,7 @@ class FreeTest01 : public FreeTest {
 	 [19-31] (13) memblock
 	 [ 32  ] ( 1) ptr2
 	 [33-63] (31) memblock
-	 [ 64  ] ( 1) ptr2
+	 [ 64  ] ( 1) ptr1
 	 [ 65  ] ( 0) HEAD
 */
 class FreeTest02 : public FreeTest {
@@ -455,12 +455,16 @@ int main(int argc, char *argv[])
 		FreeTest02 ft{};
 		ft.ensureState();
 
+		pk_mem_assert(3 == ft.bkt->alloc_count);
+		pk_mem_assert(3 == ft.bkt->debug_head_l);
+		pk_mem_assert(3 == ft.bkt->debug_head_r);
+
 		/* fill everything, then allocate [65], moving HEAD
 			 [00-18] (19) ptr0
 			 [19-31] (13) ptr3
 			 [ 32  ] ( 1) ptr2
 			 [33-63] (31) ptr4
-			 [ 64  ] ( 1) ptr2
+			 [ 64  ] ( 1) ptr1
 			 [ 65  ] ( 1) ptr5
 			 [ 66  ] ( 0) HEAD
 		*/
@@ -468,6 +472,10 @@ int main(int argc, char *argv[])
 		void *ptr4 = pk_new(31, 1, ft.bkt);
 		void *ptr5 = pk_new( 1, 1, ft.bkt);
 
+		pk_mem_assert(6 == ft.bkt->alloc_count);
+		pk_mem_assert(6 == ft.bkt->debug_head_l);
+		pk_mem_assert(6 == ft.bkt->debug_head_r);
+
 		fprintf(stdout, "block_head_r: %u\n", ft.bkt->block_head_r);
 		pk_mem_assert(0 == ft.bkt->block_head_r);
 		fprintf(stdout, "head                : %li\n", ft.bkt->head);
@@ -491,13 +499,17 @@ int main(int argc, char *argv[])
 			 [19-31] (13) memblock
 			 [ 32  ] ( 1) ptr2
 			 [33-63] (31) ptr4
-			 [ 64  ] ( 1) ptr2
+			 [ 64  ] ( 1) ptr1
 			 [ 65  ] ( 0) ptr5
 			 [ 66  ] ( 0) HEAD
 		*/
 		pk_delete(ptr3, 13, ft.bkt);
 		ptr3 = nullptr;
 
+		pk_mem_assert(5 == ft.bkt->alloc_count);
+		pk_mem_assert(3 == ft.bkt->debug_head_l);
+		pk_mem_assert(6 == ft.bkt->debug_head_r);
+
 		fprintf(stdout, "block_head_r: %u\n", ft.bkt->block_head_r);
 		pk_mem_assert(1 == ft.bkt->block_head_r);
 		fprintf(stdout, "head                : %li\n", ft.bkt->head);
@@ -522,12 +534,20 @@ int main(int argc, char *argv[])
 		pk_mem_assert(13 == ft.bkt->blocks[15].size);
 
 		/* free [32] which gets absorbed into 19-32
+			 [00-18] (19) ptr0
 			 [19-32] (13) memblock
 			 [33-63] (31) ptr4
+			 [ 64  ] ( 1) ptr1
+			 [ 65  ] ( 0) ptr5
+			 [ 66  ] ( 0) HEAD
 		*/
 		pk_delete(ft.ptrs[2], ft.sz[2], ft.bkt);
 		ft.ptrs[2] = nullptr;
 
+		pk_mem_assert(4 == ft.bkt->alloc_count);
+		pk_mem_assert(2 == ft.bkt->debug_head_l);
+		pk_mem_assert(6 == ft.bkt->debug_head_r);
+
 		fprintf(stdout, "block_head_r: %u\n", ft.bkt->block_head_r);
 		pk_mem_assert(1 == ft.bkt->block_head_r);
 		fprintf(stdout, "head                : %li\n", ft.bkt->head);