pkmem&pkev: rename pk_ne_arr & pkev use pkmem

3 files changed, 59 insertions, 13 deletions

diff --git a/test/pkev.c b/test/pkev.c
index e38ae9d..7c285d5 100644
--- a/test/pkev.c
+++ b/test/pkev.c
@@ -1,4 +1,5 @@
 
+#define PK_IMPL_MEM
 #define PK_IMPL_EV
 
 #include "../pkev.h"
@@ -8,6 +9,7 @@
 #include <stdio.h>
 
 struct ev {
+	struct pk_membucket *bkt;
 	pk_ev_mgr_id_T evmgr;
 	pk_ev_id_T evid;
 	pk_ev_cb_id_T evcbid;
@@ -48,7 +50,9 @@ test_setup()
 {
 	memset(&ev_one, 0, sizeof(struct ev));
 	memset(&ev_two, 0, sizeof(struct ev));
-	pk_ev_init();
+	ev_one.bkt = pk_mem_bucket_create("test_ev_c", PK_MEM_DEFAULT_BUCKET_SIZE, PK_MEMBUCKET_FLAG_NONE);
+	ev_two.bkt = ev_one.bkt;
+	pk_ev_init(ev_one.bkt);
 	const pk_ev_mgr_id_T evmgr = pk_ev_create_mgr();
 	if (evmgr >= 64) {
 		PK_LOGV_ERR("%s: failed to create pk_ev_mgr\n", __FILE__);
@@ -59,6 +63,13 @@ test_setup()
 	return evmgr;
 }
 
+void test_teardown() {
+	pk_ev_teardown();
+	pk_mem_bucket_destroy(ev_one.bkt);
+	ev_one.bkt = NULL;
+	ev_two.bkt = NULL;
+}
+
 int main(int argc, char *argv[])
 {
 	(void)argc;
@@ -76,8 +87,8 @@ int main(int argc, char *argv[])
 		pk_ev_emit(evmgr, ev_one.evid, NULL);
 		pk_ev_emit(evmgr, ev_two.evid, NULL);
 		PK_LOGV_INF("%s: ev_one: %i, ev_two: %i\n", __FILE__, ev_one.handled_count, ev_two.handled_count);
-		pk_ev_teardown();
 		if (ev_one.handled_count != 1 || ev_two.handled_count != 1) exit(1);
+		test_teardown();
 	}
 
 	// register, emit, catch
@@ -105,8 +116,8 @@ int main(int argc, char *argv[])
 		if (pk_ev_mstr.mgrs[ev_one.evmgr]->ev[ev_one.evid].right_ev_cbs != 1) exit (1);
 		if (pk_ev_mstr.mgrs[ev_two.evmgr]->ev[ev_two.evid].left_ev_cbs != 0) exit (1);
 		if (pk_ev_mstr.mgrs[ev_two.evmgr]->ev[ev_two.evid].right_ev_cbs != 1) exit (1);
-		pk_ev_teardown();
 		if (ev_one.handled_count != 1 || ev_two.handled_count != 1) exit(1);
+		test_teardown();
 	}
 
 	// threaded register, emit, catch
@@ -122,8 +133,8 @@ int main(int argc, char *argv[])
 		thrd_join(t1, &i);
 		thrd_join(t2, &i);
 		PK_LOGV_INF("%s: ev_one: %i, ev_two: %i\n", __FILE__, ev_one.handled_count, ev_two.handled_count);
-		pk_ev_teardown();
 		if (ev_one.handled_count != 1 || ev_two.handled_count != 1) exit(1);
+		test_teardown();
 	}
 
 	return 0;
diff --git a/test/pkev.cpp b/test/pkev.cpp
index f8b370b..0d39336 100644
--- a/test/pkev.cpp
+++ b/test/pkev.cpp
@@ -1,4 +1,5 @@
 
+#define PK_IMPL_MEM
 #define PK_IMPL_EV
 
 #include "../pkmacros.h"
@@ -26,6 +27,7 @@ exit(int code)
 }
 
 struct ev {
+	pk_membucket *bkt;
 	pk_ev_mgr_id_T evmgr;
 	pk_ev_id_T evid;
 	atomic_int count;
@@ -46,7 +48,9 @@ test_setup()
 	ev_two.evid = {};
 	ev_two.count = {};
 	ev_two.handled = {};
-	pk_ev_init();
+	ev_one.bkt = pk_mem_bucket_create("pkev_test_cpp", PK_MEM_DEFAULT_BUCKET_SIZE, PK_MEMBUCKET_FLAG_NONE);
+	ev_two.bkt = ev_one.bkt;
+	pk_ev_init(ev_one.bkt);
 	const pk_ev_mgr_id_T evmgr = pk_ev_create_mgr();
 	if (evmgr >= 64) {
 		PK_LOGV_ERR("%s: failed to create pk_ev_mgr\n", __FILE__);
@@ -57,6 +61,13 @@ test_setup()
 	return evmgr;
 }
 
+void test_teardown() {
+	pk_ev_teardown();
+	pk_mem_bucket_destroy(ev_one.bkt);
+	ev_one.bkt = NULL;
+	ev_two.bkt = NULL;
+}
+
 typedef struct cb_data {
 	int i;
 	struct ev *ev;
@@ -274,6 +285,30 @@ int main(int argc, char *argv[])
 	}
 	while(false);
 
+
+	// create multiple
+	do {
+
+		uint64_t mask = 0b1;
+		const pk_ev_mgr_id_T evmgr = test_setup();
+		(void)evmgr;
+
+		for (i = 1; i < PK_EV_INIT_MGR_COUNT; ++i) {
+			auto ev_mgr_id = pk_ev_create_mgr();
+			(void)ev_mgr_id;
+			mask |= (1ull << i);
+		}
+
+		assert(pk_ev_mstr.flg_mgrs == mask);
+
+		for (i = PK_EV_INIT_MGR_COUNT-1; i > 0; --i) {
+			pk_ev_destroy_mgr(pk_ev_mgr_id_T{i});
+		}
+
+		pk_ev_teardown();
+	}
+	while (false);
+
 	return 0;
 uncaught_err:
 	PK_LOGV_ERR("%s: failed to catch err.\n", __FILE__);
diff --git a/test/pkmem.cpp b/test/pkmem.cpp
index c19b71d..4ef1947 100644
--- a/test/pkmem.cpp
+++ b/test/pkmem.cpp
@@ -173,7 +173,7 @@ int main(int argc, char *argv[])
 		pk_membucket *bkt = pk_mem_bucket_create("test-some-dang-string", 1024, PK_MEMBUCKET_FLAG_NONE);
 		pk_mem_bucket_set_client_mem_bucket(bkt);
 
-		char *some_dang_string = pk_new<char>(64);
+		char *some_dang_string = pk_new_arr<char>(64);
 
 		fprintf(stdout, "some_dang_string: %s: %p\n", some_dang_string, (void *)some_dang_string);
 
@@ -193,7 +193,7 @@ int main(int argc, char *argv[])
 		// 576 == 1024 - EXPECTED_PK_MEMBLOCK_SIZE - (sizeof(pk_memblock) * bkt->block_capacity) - 64
 		pk_mem_assert(576 == bkt->blocks[15].size);
 
-		pk_delete<char>(some_dang_string, 64);
+		pk_delete_arr<char>(some_dang_string, 64);
 
 		pk_mem_bucket_destroy(bkt);
 	}
@@ -613,8 +613,8 @@ int main(int argc, char *argv[])
 		size_t diff;
 		pk_membucket *bkt = pk_mem_bucket_create(test_free_between, PK_MEM_DEFAULT_BUCKET_SIZE, PK_MEMBUCKET_FLAG_NONE);
 
-		char *str1 = pk_new<char>(16, bkt);
-		char *str2 = pk_new<char>(16, bkt);
+		char *str1 = pk_new_arr<char>(16, bkt);
+		char *str2 = pk_new_arr<char>(16, bkt);
 		pk_handle *handle1 = pk_new<pk_handle>(bkt);
 		pk_handle *handle2 = pk_new<pk_handle>(bkt);
 
@@ -655,10 +655,10 @@ int main(int argc, char *argv[])
 	{
 		pk_membucket *bkt = pk_mem_bucket_create(test_free_between, PK_MEM_DEFAULT_BUCKET_SIZE, PK_MEMBUCKET_FLAG_NONE);
 
-		float *flts1 = pk_new<float>(48000, bkt);
-		pk_delete<float>(flts1, 48000, bkt);
-		float *flts2 = pk_new<float>(48000, bkt);
-		pk_delete<float>(flts2, 48000, bkt);
+		float *flts1 = pk_new_arr<float>(48000, bkt);
+		pk_delete_arr<float>(flts1, 48000, bkt);
+		float *flts2 = pk_new_arr<float>(48000, bkt);
+		pk_delete_arr<float>(flts2, 48000, bkt);
 
 		pk_mem_bucket_destroy(bkt);
 	}