:zap: The store object uses a primitive method to do serialization.

2 files changed, 19 insertions, 17 deletions

diff --git a/test/swarmkv_gtest.cpp b/test/swarmkv_gtest.cpp
index 0ecd771..d34fc2e 100644
--- a/test/swarmkv_gtest.cpp
+++ b/test/swarmkv_gtest.cpp
@@ -1065,7 +1065,8 @@ TEST_F(SwarmkvNNodes, SET_GET)
 	size_t success_cnt=0, i=0;
 	
 	for(i=0; i<TEST_NODE_NUMBER; i++)
-	{		
+	{
+		cmd_exec_arg_clear(arg);
 		cmd_exec_arg_expect_cstring(arg, val1);
 		swarmkv_get(db[i], key, strlen(key), generic_callback, arg);
 		exec_successful=cmd_exec_arg_wait(arg, CMD_EXEC_TIMEOUT_MS);
@@ -1073,22 +1074,23 @@ TEST_F(SwarmkvNNodes, SET_GET)
 		{
 			success_cnt++;
 		}
-		cmd_exec_arg_clear(arg);
+		
 	}
 	EXPECT_EQ(success_cnt, TEST_NODE_NUMBER);
 
+	cmd_exec_arg_clear(arg);
 	cmd_exec_arg_expect_OK(arg);
 	swarmkv_set(db[0], key, strlen(key), val2, strlen(val2), generic_callback, arg);
 	exec_successful=cmd_exec_arg_wait(arg, CMD_EXEC_TIMEOUT_MS);
 	EXPECT_TRUE(exec_successful);
-	cmd_exec_arg_clear(arg);
+	
 
 	wait_for_sync();
 
 	success_cnt=0;
 	for(i=0; i<TEST_NODE_NUMBER; i++)
 	{
-		
+		cmd_exec_arg_clear(arg);
 		cmd_exec_arg_expect_cstring(arg, val2);
 		swarmkv_get(db[i], key, strlen(key), generic_callback, arg);
 		exec_successful=cmd_exec_arg_wait(arg, CMD_EXEC_TIMEOUT_MS);
@@ -1096,34 +1098,35 @@ TEST_F(SwarmkvNNodes, SET_GET)
 		{
 			success_cnt++;
 		}		
-		cmd_exec_arg_clear(arg);
 	}
 	EXPECT_EQ(success_cnt, TEST_NODE_NUMBER);
 
 	wait_for_sync();
-	
+
+	cmd_exec_arg_clear(arg);
 	cmd_exec_arg_expect_integer(arg, 1);
-	swarmkv_del(db[TEST_NODE_NUMBER-1], key, strlen(key), generic_callback, arg);	
+	swarmkv_del(db[TEST_NODE_NUMBER-1], key, strlen(key), generic_callback, arg);
+	exec_successful=cmd_exec_arg_wait(arg, CMD_EXEC_TIMEOUT_MS);	
 	EXPECT_TRUE(exec_successful);
-	cmd_exec_arg_clear(arg);
 
 	wait_for_sync();
 
 	success_cnt=0;
 	for(i=0; i<TEST_NODE_NUMBER; i++)
-	{		
+	{
+		cmd_exec_arg_clear(arg);
 		cmd_exec_arg_expect_NIL(arg);
 		swarmkv_get(db[i], key, strlen(key), generic_callback, arg);
 		exec_successful=cmd_exec_arg_wait(arg, CMD_EXEC_TIMEOUT_MS);
 		if(exec_successful)
 		{
 			success_cnt++;
-		}		
-		cmd_exec_arg_clear(arg);
+		}
+		
 	}
 	EXPECT_EQ(success_cnt, TEST_NODE_NUMBER);
-
 	cmd_exec_arg_free(arg);
+	
 }
 int main(int argc, char ** argv)
 {
diff --git a/test/test_utils.c b/test/test_utils.c
index e0753bc..628409c 100644
--- a/test/test_utils.c
+++ b/test/test_utils.c
@@ -31,7 +31,7 @@ struct cmd_exec_arg* cmd_exec_arg_new(void)
 	struct cmd_exec_arg* arg=(struct cmd_exec_arg*)calloc(sizeof(struct cmd_exec_arg), 1);
 	pthread_cond_init(&arg->cond, NULL);
 	pthread_mutex_init(&arg->mutex, NULL);
-	arg->callback_invoking_tid=pthread_self();
+	arg->callback_invoking_tid=syscall(SYS_gettid);
 	return arg;
 }
 void cmd_exec_arg_set_cb(struct cmd_exec_arg *arg, proc_result_callback_t *cb, void* cb_arg)
@@ -43,7 +43,6 @@ void cmd_exec_arg_free(struct cmd_exec_arg* arg)
 {
 	pthread_cond_destroy(&arg->cond);
 	pthread_mutex_destroy(&arg->mutex);
-	
 	if(arg->expected_reply.str)
 	{
 		free(arg->expected_reply.str);
@@ -56,7 +55,7 @@ void cmd_exec_arg_clear(struct cmd_exec_arg* arg)
 {
 	arg->success=0;
 	arg->is_callback_executed=0;
-	arg->callback_invoking_tid=pthread_self();
+	arg->api_invoking_tid=syscall(SYS_gettid);
 	arg->callback_invoking_tid=0;
 	arg->is_sync_callback=0;
 	return;
@@ -149,7 +148,7 @@ void cmd_exec_arg_success(struct cmd_exec_arg* arg)
 {
 	arg->is_callback_executed=1;
 	arg->success=1;
-	arg->callback_invoking_tid = pthread_self();
+	arg->callback_invoking_tid = syscall(SYS_gettid);
 	if(arg->callback_invoking_tid==arg->api_invoking_tid)
 	{
 		arg->is_sync_callback=1;
@@ -164,7 +163,7 @@ void cmd_exec_arg_failed(struct cmd_exec_arg* arg)
 {
 	arg->is_callback_executed=1;
 	arg->success=0;
-	arg->callback_invoking_tid=pthread_self();
+	arg->callback_invoking_tid=syscall(SYS_gettid);
 	if(arg->callback_invoking_tid==arg->api_invoking_tid)
 	{
 		arg->is_sync_callback=1;