From e782ad440171cc5e68c987352e3470b1a4234683 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期四, 04 二月 2021 18:41:52 +0800
Subject: [PATCH] update
---
src/net/net_mod_socket.cpp | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/net/net_mod_socket.cpp b/src/net/net_mod_socket.cpp
index e1b30d7..8c1465d 100644
--- a/src/net/net_mod_socket.cpp
+++ b/src/net/net_mod_socket.cpp
@@ -19,30 +19,30 @@
if (Signal(SIGPIPE, SIG_IGN) == SIG_ERR)
logger->error(errno, "NetModSocket::NetModSocket signal");
- gpool = new NetConnPool();
+ // gpool = new NetConnPool();
- pthread_mutexattr_t mtxAttr;
- s = pthread_mutexattr_init(&mtxAttr);
- if (s != 0)
- err_exit(s, "pthread_mutexattr_init");
- s = pthread_mutexattr_settype(&mtxAttr, PTHREAD_MUTEX_ERRORCHECK);
- if (s != 0)
- err_exit(s, "pthread_mutexattr_settype");
- s = pthread_mutex_init(&sendMutex, &mtxAttr);
- if (s != 0)
- err_exit(s, "pthread_mutex_init");
+ // pthread_mutexattr_t mtxAttr;
+ // s = pthread_mutexattr_init(&mtxAttr);
+ // if (s != 0)
+ // err_exit(s, "pthread_mutexattr_init");
+ // s = pthread_mutexattr_settype(&mtxAttr, PTHREAD_MUTEX_ERRORCHECK);
+ // if (s != 0)
+ // err_exit(s, "pthread_mutexattr_settype");
+ // s = pthread_mutex_init(&sendMutex, &mtxAttr);
+ // if (s != 0)
+ // err_exit(s, "pthread_mutex_init");
- s = pthread_mutexattr_destroy(&mtxAttr);
- if (s != 0)
- err_exit(s, "pthread_mutexattr_destroy");
+ // s = pthread_mutexattr_destroy(&mtxAttr);
+ // if (s != 0)
+ // err_exit(s, "pthread_mutexattr_destroy");
}
NetModSocket::~NetModSocket() {
int s;
- delete gpool;
- s = pthread_mutex_destroy(&sendMutex);
+ // delete gpool;
+ // s = pthread_mutex_destroy(&sendMutex);
if(s != 0) {
err_exit(s, "shm_close_socket");
}
@@ -498,10 +498,10 @@
}
-int NetModSocket::recvandsend(void **recvbuf, int *recvsize, int *key, recv_callback_fn callback,
+int NetModSocket::recvandsend(recvandsend_callback_fn callback,
const struct timespec *timeout , int flag, void * user_data ) {
- return shmModSocket.recvandsend( recvbuf, recvsize, key, callback, timeout, flag, user_data);
+ return shmModSocket.recvandsend(callback, timeout, flag, user_data);
}
--
Gitblit v1.8.0