From 8b4ddf10e71e1c8fabd33c72b282f7da65ff682f Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 14 七月 2020 15:59:44 +0800
Subject: [PATCH] commit

---
 test2/test_queue_wrapper.c |   40 ++++++++++++++++++++++------------------
 1 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/test2/test_queue_wrapper.c b/test2/test_queue_wrapper.c
index 7ae3e9c..6483fb3 100644
--- a/test2/test_queue_wrapper.c
+++ b/test2/test_queue_wrapper.c
@@ -1,36 +1,40 @@
 #include "shm_queue_wrapper.h"
 #include "mm.h"
 
-typedef struct message_t
-{
-	char method[20];
-	int code;
+// typedef struct message_t
+// {
+// 	char method[20];
+// 	int code;
 	
-} message_t;
+// } message_t;
 
 void test1() {
 	unsigned int i = 0;
-	int key = -1;
+	int key = 1;
  
 	size_t qsize = 16;
 	void * queue = shmqueue_create( &key, qsize);
-	message_t item;
+	//message_t item;
+	char msg[100];
+	void *rtmsg;
+	int size;
 	
 	for(i = 0; i < qsize; i++) {
-		sprintf(item.method, "hello"); 
-		item.code = i ; 
+		sprintf(msg, "%d hello", i); 
 		//鍏ラ槦
-		if(shmqueue_push(queue, (void *)&item, sizeof(message_t))) {
-			  printf("push:%d %s\n", item.code, item.method );
+		if(shmqueue_push(queue, (void *)msg, sizeof(msg))) {
+			  printf("push: %s\n", msg );
 		}
 	}
-	printf("%d\n", key);
-	struct timespec timeout = {1, 0};
-
+	printf("key == %d\n", key);
+	// struct timespec timeout = {1, 0};
+	// int keys[] = {1,2};
+	// shm_remove_queues_exclue((void *)keys, 1);
 	i = 0;
 	// 鍑洪槦
-	while((shmqueue_pop_timeout(queue, (void *)&item, &timeout)) ) {
-	    printf("pop:%d %s\n", item.code, item.method );
+	while((shmqueue_pop_timeout(queue, &rtmsg, &size, 1, 0)) ) {
+	    printf("pop: %s\n", (char *)rtmsg );
+	    free(rtmsg);
 	   // cout <<  item.pic << endl;
 	    i++;
 	}
@@ -41,10 +45,10 @@
 
  
 int main () {
-	mm_init(512);
+	shm_init(512);
 	test1();
 
 	//鏁翠釜杩涚▼閫�鍑烘椂闇�瑕佹墽琛岃繖涓柟娉曪紝璇ユ柟娉曢鍏堜細妫�鏌ユ槸鍚﹁繕鏈夊叾浠栬繘绋嬪湪浣跨敤璇ュ叡浜唴瀛橈紝濡傛灉杩樻湁鍏朵粬杩涚▼鍦ㄤ娇鐢ㄥ氨鍙槸detach,濡傛灉娌℃湁鍏朵粬杩涚▼鍦ㄤ娇鐢ㄥ垯閿�姣佹暣鍧楀唴瀛樸��
-	mm_destroy();
+	shm_destroy();
 	return 0;
 }
\ No newline at end of file

--
Gitblit v1.8.0