From 8bfe9f711612efde96a0d7b7aa3ba7178ab51640 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期六, 20 二月 2021 15:10:11 +0800
Subject: [PATCH] Merge branch 'master' into dev
---
src/net/net_mod_socket_wrapper.cpp | 4 ++--
test_net_socket/test_net_mod_socket.cpp | 2 +-
src/net/net_mod_socket.cpp | 8 ++++----
src/socket/shm_socket.cpp | 6 ++----
4 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/net/net_mod_socket.cpp b/src/net/net_mod_socket.cpp
index 2a23bd2..e689cea 100644
--- a/src/net/net_mod_socket.cpp
+++ b/src/net/net_mod_socket.cpp
@@ -40,12 +40,12 @@
NetModSocket::~NetModSocket() {
- int s;
+ // int s;
// delete gpool;
// s = pthread_mutex_destroy(&sendMutex);
- if(s != 0) {
- err_exit(s, "shm_socket_close");
- }
+ // if(s != 0) {
+ // err_exit(s, "shm_socket_close");
+ // }
}
diff --git a/src/net/net_mod_socket_wrapper.cpp b/src/net/net_mod_socket_wrapper.cpp
index d22a99a..6f9a66e 100644
--- a/src/net/net_mod_socket_wrapper.cpp
+++ b/src/net/net_mod_socket_wrapper.cpp
@@ -16,8 +16,8 @@
* 鍏抽棴
*/
void net_mod_socket_close(void *_socket) {
- // NetModSocket *sockt = (NetModSocket *)_socket;
- // delete sockt;
+ NetModSocket *sockt = (NetModSocket *)_socket;
+ delete sockt;
}
int net_mod_socket_stop(void *_socket) {
diff --git a/src/socket/shm_socket.cpp b/src/socket/shm_socket.cpp
index 3366491..8a131e7 100644
--- a/src/socket/shm_socket.cpp
+++ b/src/socket/shm_socket.cpp
@@ -118,10 +118,8 @@
// sockt->queue = NULL;
// }
- rv = pthread_mutex_destroy(&(sockt->mutex) );
- if(rv != 0) {
- err_exit(rv, "shm_socket_close");
- }
+ pthread_mutex_destroy(&(sockt->mutex) );
+
free(sockt);
diff --git a/test_net_socket/test_net_mod_socket.cpp b/test_net_socket/test_net_mod_socket.cpp
index 56115f8..c3538b0 100644
--- a/test_net_socket/test_net_mod_socket.cpp
+++ b/test_net_socket/test_net_mod_socket.cpp
@@ -618,7 +618,7 @@
}
printf("==========end========\n");
- shm_mm_wrapper_destroy();
+ // shm_mm_wrapper_destroy();
}
--
Gitblit v1.8.0