From d6a27f15acd08e99841595cece2b3e3e8045491a Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 13 十月 2020 18:15:55 +0800
Subject: [PATCH] update
---
src/socket/mod_socket.c | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/src/socket/mod_socket.c b/src/socket/mod_socket.c
index fcb5e58..b5a686a 100644
--- a/src/socket/mod_socket.c
+++ b/src/socket/mod_socket.c
@@ -7,7 +7,7 @@
#include "sem_util.h"
#include "logger_factory.h"
-static Logger logger = LoggerFactory::getLogger();
+static Logger *logger = LoggerFactory::getLogger();
typedef struct mod_entry_t
{
@@ -60,10 +60,7 @@
return rv;
}
-int mod_get_socket_port(void * _socket) {
- mod_socket_t * socket = (mod_socket_t *) _socket;
- return socket->shm_socket->port;
-}
+
int mod_socket_bind(void * _socket, int port){
@@ -133,11 +130,9 @@
if(socket->is_server ) {
switch(socket->mod) {
case REQ_REP:
-logger.debug("mod_send before");
SemUtil::dec(socket->items);
rv = shm_send(socket->client_socket, buf, size);
SemUtil::inc(socket->slots);
-logger.debug("mod_send after");
break;
case SURVEY:
case PUB_SUB:
@@ -152,9 +147,7 @@
}
else {
-logger.debug("mod_send before");
rv = shm_send(socket->shm_socket, buf, size);
-logger.debug("mod_send after");
return rv;
}
return -1;
@@ -168,7 +161,6 @@
if(socket->is_server ) {
switch(socket->mod) {
case REQ_REP:
-logger.debug("REQ_REP mod_recv before");
SemUtil::dec(socket->slots);
socket->recvQueue->pop(entry);
*buf = entry.buf;
@@ -176,7 +168,6 @@
socket->client_socket = entry.client_socket;
SemUtil::inc(socket->items);
-logger.debug("REQ_REP mod_recv after");
break;
case PUB_SUB:
break;
@@ -191,15 +182,18 @@
return 0;
}
else {
-logger.debug("mod_recv before");
shm_recv(socket->shm_socket, buf, size);
-logger.debug("mod_recv after");
return 0;
}
return -1;
}
+int mod_get_socket_port(void * _socket) {
+ mod_socket_t * socket = (mod_socket_t *) _socket;
+ return socket->shm_socket->port;
+}
+
void mod_free(void *buf) {
free(buf);
--
Gitblit v1.8.0