From e6512f7594f8ee3426aeab744880243e64520386 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 21 七月 2020 19:50:54 +0800
Subject: [PATCH] update
---
test_queue/test_queue_wrapper.c | 54 +++++++++++++++++++++++++++
test_socket/dgram_socket_test | 0
Makefile | 2
test_socket/Makefile | 12 ++----
4 files changed, 59 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index 44bd26e..757d648 100755
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-DIRS = src test demo
+DIRS = src test_socket demo
all:
for i in $(DIRS); do \
diff --git a/test_queue/test_queue_wrapper.c b/test_queue/test_queue_wrapper.c
new file mode 100644
index 0000000..6483fb3
--- /dev/null
+++ b/test_queue/test_queue_wrapper.c
@@ -0,0 +1,54 @@
+#include "shm_queue_wrapper.h"
+#include "mm.h"
+
+// typedef struct message_t
+// {
+// char method[20];
+// int code;
+
+// } message_t;
+
+void test1() {
+ unsigned int i = 0;
+ int key = 1;
+
+ size_t qsize = 16;
+ void * queue = shmqueue_create( &key, qsize);
+ //message_t item;
+ char msg[100];
+ void *rtmsg;
+ int size;
+
+ for(i = 0; i < qsize; i++) {
+ sprintf(msg, "%d hello", i);
+ //鍏ラ槦
+ if(shmqueue_push(queue, (void *)msg, sizeof(msg))) {
+ printf("push: %s\n", msg );
+ }
+ }
+ 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, &rtmsg, &size, 1, 0)) ) {
+ printf("pop: %s\n", (char *)rtmsg );
+ free(rtmsg);
+ // cout << item.pic << endl;
+ i++;
+ }
+
+ //閿�姣侀槦鍒�
+ shmqueue_drop(queue);
+}
+
+
+int main () {
+ shm_init(512);
+ test1();
+
+ //鏁翠釜杩涚▼閫�鍑烘椂闇�瑕佹墽琛岃繖涓柟娉曪紝璇ユ柟娉曢鍏堜細妫�鏌ユ槸鍚﹁繕鏈夊叾浠栬繘绋嬪湪浣跨敤璇ュ叡浜唴瀛橈紝濡傛灉杩樻湁鍏朵粬杩涚▼鍦ㄤ娇鐢ㄥ氨鍙槸detach,濡傛灉娌℃湁鍏朵粬杩涚▼鍦ㄤ娇鐢ㄥ垯閿�姣佹暣鍧楀唴瀛樸��
+ shm_destroy();
+ return 0;
+}
\ No newline at end of file
diff --git a/test_socket/Makefile b/test_socket/Makefile
index 5828f23..c2a7f89 100644
--- a/test_socket/Makefile
+++ b/test_socket/Makefile
@@ -2,19 +2,19 @@
# Makefile for common library.
#
ROOT=..
-LDLIBS+=-Wl,-rpath=$(ROOT)/queue:$(ROOT)/lib
+LDLIBS+=-Wl,-rpath=$(ROOT)/lib:$(ROOT)/build/lib
# 寮�婧愬伐鍏峰寘璺緞
-LDDIR += -L$(ROOT)/queue
+LDDIR += -L$(ROOT)/build/lib
# 寮�婧愬伐鍏峰寘
LDLIBS += -lshm_queue -lusgcommon -lpthread
-INCLUDE += -I$(ROOT)/queue/ -I$(ROOT)/queue/include
+INCLUDE += -I$(ROOT)/build/include
PLATFORM=$(shell $(ROOT)/systype.sh)
include $(ROOT)/Make.defines.$(PLATFORM)
-PROGS = req_rep pub_sub
+PROGS = dgram_socket_test
build: $(PROGS)
@@ -26,7 +26,3 @@
clean:
rm -f $(TEMPFILES) $(PROGS)
-
-
-$(LIBQUEUE):
- (cd $(ROOT)/queue && $(MAKE))
diff --git a/test_socket/dgram_socket_test b/test_socket/dgram_socket_test
index 6770bc1..d493973 100755
--- a/test_socket/dgram_socket_test
+++ b/test_socket/dgram_socket_test
Binary files differ
--
Gitblit v1.8.0