From 8b89e81b09adbb06f6e5e64aa115a1eef6e75b57 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 30 十一月 2020 11:10:15 +0800
Subject: [PATCH] update

---
 test/lambda.c                         |    6 +-
 test_net_socket/test_net_mod_socket.c |    4 
 test_queue/test_queue_wrapper.c       |    4 
 test_socket/dgram_socket_test         |    0 
 src/socket/dgram_mod_socket.c         |    7 ++
 test_socket/server                    |    0 
 demo/pub_sub                          |    0 
 src/queue/shm_mm_wraper.h             |    6 +-
 src/queue/shm_queue_wrapper.h         |    9 --
 test_socket/dgram_socket_test.c       |    8 +-
 test_socket/dgram_mod_bus.c           |    4 
 demo/stream_mod_req_rep.c             |    4 
 test_socket/stream_mod_pub_sub.c      |    6 +-
 test/test_type.c                      |    4 
 test_socket/stream_socket_test.c      |    6 +-
 src/queue/shm_mm_wrapper.c            |    8 +-
 test_socket/client.c                  |    4 
 test_socket/dgram_mod_req_rep.c       |    6 +-
 test_socket/stream_mod_req_rep.c      |    6 +-
 demo/dgram_mod_bus.c                  |    4 
 demo/queue.c                          |    6 +-
 README.md                             |    6 +-
 demo/dgram_mod_req_rep.c              |    4 
 test_socket/test_timeout.c            |    4 
 demo/dgram_mod_survey.c               |    4 
 test_socket/dgram_mod_survey.c        |    8 +-
 demo/stream_mod_pub_sub.c             |    6 +-
 test_socket/server.c                  |    4 
 test_socket/test_open_close.c         |    4 
 test_socket/survey.c                  |    6 +-
 test_socket/client                    |    0 
 31 files changed, 75 insertions(+), 73 deletions(-)

diff --git a/README.md b/README.md
index f0313ed..36dae67 100644
--- a/README.md
+++ b/README.md
@@ -131,20 +131,20 @@
 
 # 2. 鎺ュ彛璇存槑
 
-shm_mm.h
+shm_mm_wraper.h
 ```
 /**
  * 鍒濆鍖栧叡浜唴瀛�
  * @size 鍏变韩鍐呭瓨澶у皬, 鍗曚綅M
  * 
  */
-void shm_init(int size);
+void shm_mm_wrapper_init(int size);
 
 /**
  * 閿�姣佸叡浜唴瀛�
  * 鏁翠釜杩涚▼閫�鍑烘椂闇�瑕佹墽琛岃繖涓柟娉曪紝璇ユ柟娉曢鍏堜細妫�鏌ユ槸鍚﹁繕鏈夊叾浠栬繘绋嬪湪浣跨敤璇ュ叡浜唴瀛橈紝濡傛灉杩樻湁鍏朵粬杩涚▼鍦ㄤ娇鐢ㄥ氨鍙槸detach,濡傛灉娌℃湁鍏朵粬杩涚▼鍦ㄤ娇鐢ㄥ垯閿�姣佹暣鍧楀唴瀛樸��
  */
-void shm_destroy();
+void shm_mm_wrapper_destroy();
 ```
 
 dgram_mod_socket.h
diff --git a/demo/dgram_mod_bus.c b/demo/dgram_mod_bus.c
index 1c6268d..3d53898 100644
--- a/demo/dgram_mod_bus.c
+++ b/demo/dgram_mod_bus.c
@@ -1,5 +1,5 @@
 #include "dgram_mod_socket.h"
-#include "shm_mm.h"
+#include "shm_mm_wraper.h"
 #include "usg_common.h"
 #include "mm.h"
 
@@ -73,7 +73,7 @@
  
 
 int main(int argc, char *argv[]) {
-  shm_init(512);
+  shm_mm_wrapper_init(512);
   int port;
   if (argc < 3) {
     fprintf(stderr, "Usage: %s %s|%s <PORT> ...\n", argv[0], "server", "client");
diff --git a/demo/dgram_mod_req_rep.c b/demo/dgram_mod_req_rep.c
index b26d61d..512f279 100644
--- a/demo/dgram_mod_req_rep.c
+++ b/demo/dgram_mod_req_rep.c
@@ -2,7 +2,7 @@
  * 閫傚簲浜庢敞鍐�
  */
 #include "dgram_mod_socket.h"
-#include "shm_mm.h"
+#include "shm_mm_wraper.h"
 #include "usg_common.h"
 
 void server(int port) {
@@ -41,7 +41,7 @@
 }
 
 int main(int argc, char *argv[]) {
-  shm_init(512);
+  shm_mm_wrapper_init(512);
   int port;
   if (argc < 3) {
     usage();
diff --git a/demo/dgram_mod_survey.c b/demo/dgram_mod_survey.c
index a462fef..86fe781 100644
--- a/demo/dgram_mod_survey.c
+++ b/demo/dgram_mod_survey.c
@@ -3,7 +3,7 @@
  */
 
 #include "dgram_mod_socket.h"
-#include "shm_mm.h"
+#include "shm_mm_wraper.h"
 #include "usg_common.h"
 
 void server(int port) {
@@ -41,7 +41,7 @@
  
 
 int main(int argc, char *argv[]) {
-  shm_init(512);
+  shm_mm_wrapper_init(512);
   int port;
   if (argc < 3) {
     fprintf(stderr, "Usage: reqrep %s|%s <PORT> ...\n", "server", "client");
diff --git a/demo/pub_sub b/demo/pub_sub
index de2e57e..c26079b 100755
--- a/demo/pub_sub
+++ b/demo/pub_sub
Binary files differ
diff --git a/demo/queue.c b/demo/queue.c
index 265b574..7488861 100644
--- a/demo/queue.c
+++ b/demo/queue.c
@@ -1,5 +1,5 @@
 #include "shm_queue_wrapper.h"
-#include "shm_mm.h"
+#include "shm_mm_wraper.h"
 
 // typedef struct message_t
 // {
@@ -45,10 +45,10 @@
 
  
 int main () {
-	shm_init(512);
+	shm_mm_wrapper_init(512);
 	test1();
 
 	//鏁翠釜杩涚▼閫�鍑烘椂闇�瑕佹墽琛岃繖涓柟娉曪紝璇ユ柟娉曢鍏堜細妫�鏌ユ槸鍚﹁繕鏈夊叾浠栬繘绋嬪湪浣跨敤璇ュ叡浜唴瀛橈紝濡傛灉杩樻湁鍏朵粬杩涚▼鍦ㄤ娇鐢ㄥ氨鍙槸detach,濡傛灉娌℃湁鍏朵粬杩涚▼鍦ㄤ娇鐢ㄥ垯閿�姣佹暣鍧楀唴瀛樸��
-	shm_destroy();
+	shm_mm_wrapper_destroy();
 	return 0;
 }
\ No newline at end of file
diff --git a/demo/stream_mod_pub_sub.c b/demo/stream_mod_pub_sub.c
index 78aff69..10e0ef1 100644
--- a/demo/stream_mod_pub_sub.c
+++ b/demo/stream_mod_pub_sub.c
@@ -1,5 +1,5 @@
 #include "mod_socket.h"
-#include "shm_mm.h"
+#include "shm_mm_wraper.h"
 #include "usg_common.h"
 
 
@@ -35,7 +35,7 @@
 }
 
 int main(int argc, char *argv[]) {
-  shm_init(512);
+  shm_mm_wrapper_init(512);
   int port;
   if (argc < 3) {
   	 fprintf(stderr, "Usage: reqrep %s|%s <PORT> ...\n", "server", "client");
@@ -51,7 +51,7 @@
   if (strcmp("client", argv[1]) == 0)
      client(port);
    
- shm_destroy();
+ shm_mm_wrapper_destroy();
  // fprintf(stderr, "Usage: reqrep %s|%s <URL> ...\n", "server", "client");
   return 0;
 }
\ No newline at end of file
diff --git a/demo/stream_mod_req_rep.c b/demo/stream_mod_req_rep.c
index 5ae3133..24a2386 100644
--- a/demo/stream_mod_req_rep.c
+++ b/demo/stream_mod_req_rep.c
@@ -1,5 +1,5 @@
 #include "mod_socket.h"
-#include "shm_mm.h"
+#include "shm_mm_wraper.h"
 #include "usg_common.h"
 
 void server(int port) {
@@ -39,7 +39,7 @@
  
 
 int main(int argc, char *argv[]) {
-  shm_init(512);
+  shm_mm_wrapper_init(512);
   int port;
   if (argc < 3) {
     fprintf(stderr, "Usage: reqrep %s|%s <PORT> ...\n", "server", "client");
diff --git a/src/queue/shm_mm_wraper.h b/src/queue/shm_mm_wraper.h
index ec094ac..0ab3a35 100644
--- a/src/queue/shm_mm_wraper.h
+++ b/src/queue/shm_mm_wraper.h
@@ -10,15 +10,15 @@
  * @size 鍏变韩鍐呭瓨澶у皬, 鍗曚綅M
  * 
  */
-void shm_init(int size);
+void shm_mm_wrapper_init(int size);
 
 /**
  * 閿�姣佸叡浜唴瀛�
  * 鏁翠釜杩涚▼閫�鍑烘椂闇�瑕佹墽琛岃繖涓柟娉曪紝璇ユ柟娉曢鍏堜細妫�鏌ユ槸鍚﹁繕鏈夊叾浠栬繘绋嬪湪浣跨敤璇ュ叡浜唴瀛橈紝濡傛灉杩樻湁鍏朵粬杩涚▼鍦ㄤ娇鐢ㄥ氨鍙槸detach,濡傛灉娌℃湁鍏朵粬杩涚▼鍦ㄤ娇鐢ㄥ垯閿�姣佹暣鍧楀唴瀛樸��
  */
-void shm_destroy();
+void shm_mm_wrapper_destroy();
 
-int shm_alloc_key();
+int shm_mm_wrapper_alloc_key();
 
 
 #ifdef __cplusplus
diff --git a/src/queue/shm_mm_wrapper.c b/src/queue/shm_mm_wrapper.c
index 3635d8b..6175923 100644
--- a/src/queue/shm_mm_wrapper.c
+++ b/src/queue/shm_mm_wrapper.c
@@ -1,15 +1,15 @@
-#include "shm_mm.h"
+#include "shm_mm_wraper.h"
 #include "mem_pool.h"
 #include "hashtable.h"
 
-void shm_init(int size) {
+void shm_mm_wrapper_init(int size) {
 	mem_pool_init(size);
 }
 
-void shm_destroy() {
+void shm_mm_wrapper_destroy() {
 	mem_pool_destroy();
 }
 
-int shm_alloc_key() {
+int shm_mm_wrapper_alloc_key() {
 	return mm_alloc_key();
 }
diff --git a/src/queue/shm_queue_wrapper.h b/src/queue/shm_queue_wrapper.h
index 10d3b16..369a062 100644
--- a/src/queue/shm_queue_wrapper.h
+++ b/src/queue/shm_queue_wrapper.h
@@ -5,10 +5,7 @@
 #include "usg_typedef.h"
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
+ 
  
 
 /**
@@ -96,8 +93,6 @@
  */
 void shmqueue_free(void *ptr);
 
-#ifdef __cplusplus
-}
-#endif
+
 
 #endif
\ No newline at end of file
diff --git a/src/socket/dgram_mod_socket.c b/src/socket/dgram_mod_socket.c
index 1976616..cd560b2 100644
--- a/src/socket/dgram_mod_socket.c
+++ b/src/socket/dgram_mod_socket.c
@@ -7,7 +7,14 @@
 } dgram_mod_socket_t;
 
 
+int dgram_mod_remove_keys(int keys[], int length){
+	return ShmModSocket::remove_keys(keys, length);
+}
 
+int dgram_mod_remove_key(int key){
+	int keys[] = {key};
+	return ShmModSocket::remove_keys(keys, 1);
+}
 /**
  * 鍒涘缓socket
  * @return socket鍦板潃
diff --git a/test/lambda.c b/test/lambda.c
index b8c2fd4..b182f0a 100644
--- a/test/lambda.c
+++ b/test/lambda.c
@@ -1,10 +1,10 @@
 #include "usg_common.h"
 #include "usg_typedef.h"
 #include "hashtable.h"
-#include "shm_mm.h"
+#include "shm_mm_wraper.h"
 
 int main() {
-	shm_init(512);
+	shm_mm_wrapper_init(512);
 	hashtable_t hashtable;
 
 	hashtable_init(&hashtable);
@@ -15,5 +15,5 @@
 	hashtable_foreach(&hashtable, [&](int key, void * value){
 		printf("%d, %p\n", key, value);
 	});
-	shm_destroy();
+	shm_mm_wrapper_destroy();
 }
\ No newline at end of file
diff --git a/test/test_type.c b/test/test_type.c
index 6415266..bae8b44 100644
--- a/test/test_type.c
+++ b/test/test_type.c
@@ -1,13 +1,13 @@
 #include "usg_common.h"
 #include "usg_typedef.h"
 #include "dgram_mod_socket.h"
-#include "shm_mm.h"
+#include "shm_mm_wraper.h"
 #include "mm.h"
 #include <typeinfo>
 #include "lock_free_queue.h"
 
 int main() {
-	shm_init(512);
+	shm_mm_wrapper_init(512);
 	LockFreeQueue<int> * queue = new LockFreeQueue<int>(16);
 	void * tmp = (void *)queue;
 	std::cout << typeid(queue).name() << std::endl;
diff --git a/test_net_socket/test_net_mod_socket.c b/test_net_socket/test_net_mod_socket.c
index 4989b14..15c9e55 100644
--- a/test_net_socket/test_net_mod_socket.c
+++ b/test_net_socket/test_net_mod_socket.c
@@ -1,6 +1,6 @@
 #include "net_mod_server_socket_wrapper.h"
 #include "net_mod_socket_wrapper.h"
-#include "shm_mm.h"
+#include "shm_mm_wraper.h"
 #include "usg_common.h"
 #include <getopt.h>
 
@@ -257,7 +257,7 @@
 
 
 int main(int argc, char *argv[]) {
-	shm_init(512);
+	shm_mm_wrapper_init(512);
  
   argument_t opt = parse_args(argc, argv);
 
diff --git a/test_queue/test_queue_wrapper.c b/test_queue/test_queue_wrapper.c
index 6483fb3..3e63441 100644
--- a/test_queue/test_queue_wrapper.c
+++ b/test_queue/test_queue_wrapper.c
@@ -45,10 +45,10 @@
 
  
 int main () {
-	shm_init(512);
+	shm_mm_wrapper_init(512);
 	test1();
 
 	//鏁翠釜杩涚▼閫�鍑烘椂闇�瑕佹墽琛岃繖涓柟娉曪紝璇ユ柟娉曢鍏堜細妫�鏌ユ槸鍚﹁繕鏈夊叾浠栬繘绋嬪湪浣跨敤璇ュ叡浜唴瀛橈紝濡傛灉杩樻湁鍏朵粬杩涚▼鍦ㄤ娇鐢ㄥ氨鍙槸detach,濡傛灉娌℃湁鍏朵粬杩涚▼鍦ㄤ娇鐢ㄥ垯閿�姣佹暣鍧楀唴瀛樸��
-	shm_destroy();
+	shm_mm_wrapper_destroy();
 	return 0;
 }
\ No newline at end of file
diff --git a/test_socket/client b/test_socket/client
index 9dab546..0b861e8 100755
--- a/test_socket/client
+++ b/test_socket/client
Binary files differ
diff --git a/test_socket/client.c b/test_socket/client.c
index 501c0fd..5c9210b 100644
--- a/test_socket/client.c
+++ b/test_socket/client.c
@@ -38,10 +38,10 @@
 
  
 int main () {
-	shm_init(512);
+	shm_mm_wrapper_init(512);
 	client();
 
 	//鏁翠釜杩涚▼閫�鍑烘椂闇�瑕佹墽琛岃繖涓柟娉曪紝璇ユ柟娉曢鍏堜細妫�鏌ユ槸鍚﹁繕鏈夊叾浠栬繘绋嬪湪浣跨敤璇ュ叡浜唴瀛橈紝濡傛灉杩樻湁鍏朵粬杩涚▼鍦ㄤ娇鐢ㄥ氨鍙槸detach,濡傛灉娌℃湁鍏朵粬杩涚▼鍦ㄤ娇鐢ㄥ垯閿�姣佹暣鍧楀唴瀛樸��
-	shm_destroy();
+	shm_mm_wrapper_destroy();
 	return 0;
 }
\ No newline at end of file
diff --git a/test_socket/dgram_mod_bus.c b/test_socket/dgram_mod_bus.c
index 9f4795b..042b2fd 100644
--- a/test_socket/dgram_mod_bus.c
+++ b/test_socket/dgram_mod_bus.c
@@ -1,5 +1,5 @@
 #include "dgram_mod_socket.h"
-#include "shm_mm.h"
+#include "shm_mm_wraper.h"
 #include "usg_common.h"
 #include "mm.h"
 
@@ -98,7 +98,7 @@
  
 
 int main(int argc, char *argv[]) {
-  shm_init(512);
+  shm_mm_wrapper_init(512);
   int key;
   if (argc < 3) {
     fprintf(stderr, "Usage: %s %s|%s|rmkey <key> ...\n", argv[0], "server", "client");
diff --git a/test_socket/dgram_mod_req_rep.c b/test_socket/dgram_mod_req_rep.c
index 9a021a1..54cbe4b 100644
--- a/test_socket/dgram_mod_req_rep.c
+++ b/test_socket/dgram_mod_req_rep.c
@@ -1,5 +1,5 @@
 #include "dgram_mod_socket.h"
-#include "shm_mm.h"
+#include "shm_mm_wraper.h"
 #include "usg_common.h"
 #include "lock_free_queue.h"
 
@@ -150,7 +150,7 @@
  
 
 int main(int argc, char *argv[]) {
-  shm_init(512);
+  shm_mm_wrapper_init(512);
   int port;
   if (argc < 3) {
     fprintf(stderr, "Usage: reqrep %s|%s <PORT> ...\n", "server", "client");
@@ -160,7 +160,7 @@
   port = atoi(argv[2]);
 
   if (strcmp("server", argv[1]) == 0) {
-    // int temp = shm_alloc_key();
+    // int temp = shm_mm_wrapper_alloc_key();
     // printf("tmp=%d\n", temp);
     server(port);
   } else if (strcmp("mclient", argv[1]) == 0) {
diff --git a/test_socket/dgram_mod_survey.c b/test_socket/dgram_mod_survey.c
index 4abce2c..da3260f 100644
--- a/test_socket/dgram_mod_survey.c
+++ b/test_socket/dgram_mod_survey.c
@@ -1,5 +1,5 @@
 #include "dgram_mod_socket.h"
-#include "shm_mm.h"
+#include "shm_mm_wraper.h"
 #include "usg_common.h"
 
 
@@ -12,7 +12,7 @@
 void sigint_handler(int sig) {
    //dgram_mod_close_socket(server_socket);
   printf("===Catch sigint======================\n");
-  shm_destroy();
+  shm_mm_wrapper_destroy();
   exit(0);
 }
 
@@ -106,7 +106,7 @@
 }
 
 int main(int argc, char *argv[]) {
-  shm_init(512);
+  shm_mm_wrapper_init(512);
   int port;
   if (argc < 3) {
     fprintf(stderr, "Usage: reqrep %s|%s <PORT> ...\n", "server", "client");
@@ -122,6 +122,6 @@
   if (strcmp("client", argv[1]) == 0)
     client(port);
 
-  shm_destroy();
+  shm_mm_wrapper_destroy();
   return 0;
 }
diff --git a/test_socket/dgram_socket_test b/test_socket/dgram_socket_test
index ca33409..f61bf91 100755
--- a/test_socket/dgram_socket_test
+++ b/test_socket/dgram_socket_test
Binary files differ
diff --git a/test_socket/dgram_socket_test.c b/test_socket/dgram_socket_test.c
index 97c602a..711a72c 100644
--- a/test_socket/dgram_socket_test.c
+++ b/test_socket/dgram_socket_test.c
@@ -1,10 +1,10 @@
 #include "shm_socket.h"
 #include "usg_common.h"
-#include "shm_mm.h"
+#include "shm_mm_wraper.h"
 
 #include "shm_socket.h"
 #include "usg_common.h"
-#include "shm_mm.h"
+#include "shm_mm_wraper.h"
 typedef struct Targ {
 	int port;
 	int id;
@@ -50,7 +50,7 @@
 }
  
 int main(int argc, char *argv[]) {
-  shm_init(512);
+  shm_mm_wrapper_init(512);
   int port;
   if (argc < 3) {
   	 fprintf(stderr, "Usage: reqrep %s|%s <PORT> ...\n", "server", "client");
@@ -68,7 +68,7 @@
 
 
 
-  shm_destroy();
+  shm_mm_wrapper_destroy();
  // fprintf(stderr, "Usage: reqrep %s|%s <URL> ...\n", "server", "client");
   return 0;
 }
\ No newline at end of file
diff --git a/test_socket/server b/test_socket/server
index d1b9095..80fe19d 100755
--- a/test_socket/server
+++ b/test_socket/server
Binary files differ
diff --git a/test_socket/server.c b/test_socket/server.c
index d969c83..8cfc4ae 100644
--- a/test_socket/server.c
+++ b/test_socket/server.c
@@ -35,10 +35,10 @@
 
  
 int main () {
-	shm_init(512);
+	shm_mm_wrapper_init(512);
 	server();
 
 	//鏁翠釜杩涚▼閫�鍑烘椂闇�瑕佹墽琛岃繖涓柟娉曪紝璇ユ柟娉曢鍏堜細妫�鏌ユ槸鍚﹁繕鏈夊叾浠栬繘绋嬪湪浣跨敤璇ュ叡浜唴瀛橈紝濡傛灉杩樻湁鍏朵粬杩涚▼鍦ㄤ娇鐢ㄥ氨鍙槸detach,濡傛灉娌℃湁鍏朵粬杩涚▼鍦ㄤ娇鐢ㄥ垯閿�姣佹暣鍧楀唴瀛樸��
-	shm_destroy();
+	shm_mm_wrapper_destroy();
 	return 0;
 }
\ No newline at end of file
diff --git a/test_socket/stream_mod_pub_sub.c b/test_socket/stream_mod_pub_sub.c
index 78aff69..10e0ef1 100644
--- a/test_socket/stream_mod_pub_sub.c
+++ b/test_socket/stream_mod_pub_sub.c
@@ -1,5 +1,5 @@
 #include "mod_socket.h"
-#include "shm_mm.h"
+#include "shm_mm_wraper.h"
 #include "usg_common.h"
 
 
@@ -35,7 +35,7 @@
 }
 
 int main(int argc, char *argv[]) {
-  shm_init(512);
+  shm_mm_wrapper_init(512);
   int port;
   if (argc < 3) {
   	 fprintf(stderr, "Usage: reqrep %s|%s <PORT> ...\n", "server", "client");
@@ -51,7 +51,7 @@
   if (strcmp("client", argv[1]) == 0)
      client(port);
    
- shm_destroy();
+ shm_mm_wrapper_destroy();
  // fprintf(stderr, "Usage: reqrep %s|%s <URL> ...\n", "server", "client");
   return 0;
 }
\ No newline at end of file
diff --git a/test_socket/stream_mod_req_rep.c b/test_socket/stream_mod_req_rep.c
index 9eebee2..7f766e9 100644
--- a/test_socket/stream_mod_req_rep.c
+++ b/test_socket/stream_mod_req_rep.c
@@ -1,5 +1,5 @@
 #include "mod_socket.h"
-#include "shm_mm.h"
+#include "shm_mm_wraper.h"
 #include "usg_common.h"
 #include "logger_factory.h"
 static Logger logger = LoggerFactory::getLogger();
@@ -100,7 +100,7 @@
 }
 
 int main(int argc, char *argv[]) {
-  shm_init(512);
+  shm_mm_wrapper_init(512);
   int port;
   if (argc < 3) {
     fprintf(stderr, "Usage: reqrep %s|%s <PORT> ...\n", "server", "client");
@@ -118,7 +118,7 @@
 
   if (strcmp("mclient", argv[1]) == 0)
     multyThreadClient(port);
-  shm_destroy();
+  shm_mm_wrapper_destroy();
   // fprintf(stderr, "Usage: reqrep %s|%s <URL> ...\n", "server", "client");
   return 0;
 }
\ No newline at end of file
diff --git a/test_socket/stream_socket_test.c b/test_socket/stream_socket_test.c
index eae99d4..e5c1029 100644
--- a/test_socket/stream_socket_test.c
+++ b/test_socket/stream_socket_test.c
@@ -1,6 +1,6 @@
 #include "shm_socket.h"
 #include "usg_common.h"
-#include "shm_mm.h"
+#include "shm_mm_wraper.h"
 typedef struct Targ {
 	int port;
 	int id;
@@ -142,7 +142,7 @@
 }
 
 int main(int argc, char *argv[]) {
-  shm_init(512);
+  shm_mm_wrapper_init(512);
   int port;
   if (argc < 3) {
   	 fprintf(stderr, "Usage: reqrep %s|%s <PORT> ...\n", "server", "client");
@@ -161,7 +161,7 @@
  if (strcmp("mclient", argv[1]) == 0)
      multyThreadClient(port);
 
-  shm_destroy();
+  shm_mm_wrapper_destroy();
  // fprintf(stderr, "Usage: reqrep %s|%s <URL> ...\n", "server", "client");
   return 0;
 }
\ No newline at end of file
diff --git a/test_socket/survey.c b/test_socket/survey.c
index d5dac85..3e96915 100644
--- a/test_socket/survey.c
+++ b/test_socket/survey.c
@@ -1,5 +1,5 @@
 #include "mod_socket.h"
-#include "shm_mm.h"
+#include "shm_mm_wraper.h"
 #include "usg_common.h"
 
 #define SERVER "server"
@@ -67,7 +67,7 @@
 }
 
 int main(const int argc, const char **argv) {
-  shm_init(512);
+  shm_mm_wrapper_init(512);
   int port;
   if ((argc >= 2) && (strcmp(SERVER, argv[1]) == 0)) {
     port = atoi(argv[2]);
@@ -80,7 +80,7 @@
     fprintf(stderr, "Usage: survey %s|%s <URL> <ARG> ...\n", SERVER, CLIENT);
   }
 
-  shm_destroy();
+  shm_mm_wrapper_destroy();
 
   return 0;
 }
\ No newline at end of file
diff --git a/test_socket/test_open_close.c b/test_socket/test_open_close.c
index 4baae1d..70daa75 100644
--- a/test_socket/test_open_close.c
+++ b/test_socket/test_open_close.c
@@ -1,10 +1,10 @@
 #include "dgram_mod_socket.h"
-#include "shm_mm.h"
+#include "shm_mm_wraper.h"
 #include "usg_common.h"
 #include "lock_free_queue.h"
 
 int main() {
-	shm_init(512);
+	shm_mm_wrapper_init(512);
 	void *socket = dgram_mod_open_socket();
 	dgram_mod_close_socket(socket);
 	// dgram_mod_close_socket(socket);
diff --git a/test_socket/test_timeout.c b/test_socket/test_timeout.c
index e48f0b4..a7b62af 100644
--- a/test_socket/test_timeout.c
+++ b/test_socket/test_timeout.c
@@ -1,5 +1,5 @@
 #include "dgram_mod_socket.h"
-#include "shm_mm.h"
+#include "shm_mm_wraper.h"
 #include "usg_common.h"
 
 void server(int port) {
@@ -42,7 +42,7 @@
  
 
 int main(int argc, char *argv[]) {
-  shm_init(512);
+  shm_mm_wrapper_init(512);
   int port;
   if (argc < 3) {
     fprintf(stderr, "Usage: reqrep %s|%s <PORT> ...\n", "server", "client");

--
Gitblit v1.8.0