From 213c00f5146d9e25b0fd7ab09860185dc4eaabbf Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期三, 14 十月 2020 11:59:11 +0800
Subject: [PATCH] update
---
src/socket/shm_socket.c | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/src/socket/shm_socket.c b/src/socket/shm_socket.c
index ea2f674..ab34bca 100644
--- a/src/socket/shm_socket.c
+++ b/src/socket/shm_socket.c
@@ -3,7 +3,7 @@
#include "logger_factory.h"
#include <map>
-static Logger logger = LoggerFactory::getLogger();
+static Logger *logger = LoggerFactory::getLogger();
@@ -43,20 +43,26 @@
socket->force_bind = false;
socket->dispatch_thread = 0;
socket->status = SHM_CONN_CLOSED;
-
+ socket->mutex = SemUtil::get(IPC_PRIVATE, 1);
return socket;
}
int shm_close_socket(shm_socket_t *socket) {
+
+ int ret;
switch (socket->socket_type) {
- case SHM_SOCKET_STREAM:
- return _shm_close_stream_socket(socket, true);
- case SHM_SOCKET_DGRAM:
- return _shm_close_dgram_socket(socket);
- default:
- return -1;
+ case SHM_SOCKET_STREAM:
+ ret = _shm_close_stream_socket(socket, true);
+ break;
+ case SHM_SOCKET_DGRAM:
+ ret = _shm_close_dgram_socket(socket);
+ break;
+ default:
+ break;
}
- return -1;
+ SemUtil::remove(socket->mutex);
+ free(socket);
+ return ret;
}
int shm_socket_bind(shm_socket_t *socket, int port) {
@@ -258,6 +264,7 @@
}
hashtable_t *hashtable = mm_get_hashtable();
+ SemUtil::dec(socket->mutex);
if (socket->queue == NULL) {
if (socket->port == -1) {
socket->port = hashtable_alloc_key(hashtable);
@@ -268,6 +275,8 @@
socket->queue = new SHMQueue<shm_msg_t>(socket->port, 16);
}
+ SemUtil::inc(socket->mutex);
+
if (port == socket->port) {
err_msg(0, "can not send to your self!");
return -1;
@@ -316,6 +325,7 @@
socket->socket_type);
}
hashtable_t *hashtable = mm_get_hashtable();
+ SemUtil::dec(socket->mutex);
if (socket->queue == NULL) {
if (socket->port == -1) {
socket->port = hashtable_alloc_key(hashtable);
@@ -326,6 +336,7 @@
socket->queue = new SHMQueue<shm_msg_t>(socket->port, 16);
}
+ SemUtil::inc(socket->mutex);
shm_msg_t src;
// printf("shm_recvfrom pop before\n");
@@ -526,7 +537,7 @@
if (socket->dispatch_thread != 0)
pthread_cancel(socket->dispatch_thread);
- free(socket);
+
return 0;
}
@@ -536,7 +547,7 @@
delete socket->queue;
socket->queue = NULL;
}
- free(socket);
+
return 0;
}
--
Gitblit v1.8.0