From f85c9b875b060681b51f57b15074ba1c7c9f5636 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 20 七月 2020 11:10:02 +0800
Subject: [PATCH] update
---
queue/shm_socket.c | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/queue/shm_socket.c b/queue/shm_socket.c
index 6666db1..4fb90cf 100644
--- a/queue/shm_socket.c
+++ b/queue/shm_socket.c
@@ -68,6 +68,7 @@
client_socket->remoteQueue->push_timeout(close_msg, &timeout);
delete client_socket->remoteQueue;
client_socket->remoteQueue=NULL;
+
delete client_socket->messageQueue;
client_socket->messageQueue=NULL;
socket->clientSocketMap->erase(iter);
@@ -89,9 +90,7 @@
return _shm_close_socket(socket, true);
}
-
-
-int shm_soket_bind(shm_socket_t * socket, int port) {
+int shm_socket_bind(shm_socket_t * socket, int port) {
shm_socket_t * _socket = (shm_socket_t *) socket;
_socket -> port = port;
return 0;
@@ -113,10 +112,10 @@
socket->queue = new SHMQueue<shm_msg_t>(socket->port, 16);
socket->acceptQueue = new LockFreeQueue<shm_msg_t, DM_Allocator>(16);
socket->clientSocketMap = new std::map<int, shm_socket_t* >;
-
+ socket->status = SHM_CONN_LISTEN;
pthread_create(&(socket->dispatch_thread), NULL, _server_run_msg_rev , (void *)socket);
- socket->status = SHM_CONN_LISTEN;
+
return 0;
}
@@ -308,10 +307,10 @@
int shm_send(shm_socket_t *socket, const void *buf, const int size) {
// hashtable_t *hashtable = mm_get_hashtable();
- if(socket->remoteQueue == NULL) {
- err_msg(errno, "褰撳墠瀹㈡埛绔棤杩炴帴!");
- return -1;
- }
+ // if(socket->remoteQueue == NULL) {
+ // err_msg(errno, "褰撳墠瀹㈡埛绔棤杩炴帴!");
+ // return -1;
+ // }
shm_msg_t dest;
dest.type=SHM_COMMON_MSG;
dest.port = socket->port;
--
Gitblit v1.8.0