From a856e56b3943041d64a22285c550f6dbb9d2e193 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 27 十一月 2020 15:53:43 +0800
Subject: [PATCH] update
---
src/socket/shm_mod_socket.h | 74 ++++++++++++------------
src/socket/shm_socket.c | 56 +++++++++++-------
src/socket/shm_stream_mod_socket.h | 6 +-
Makefile | 1
test_net_socket/net_mod_socket.sh | 10 +--
5 files changed, 80 insertions(+), 67 deletions(-)
diff --git a/Makefile b/Makefile
index d471709..74a5919 100755
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@
@for i in $(DIRS); do \
(cd $$i && echo ">>>>>> cleaning $$i ..." && $(MAKE) clean) || exit 1; \
done
+
tar:
rm -f $(TAR_NAME)
diff --git a/src/socket/shm_mod_socket.h b/src/socket/shm_mod_socket.h
index 34c78a5..e515011 100644
--- a/src/socket/shm_mod_socket.h
+++ b/src/socket/shm_mod_socket.h
@@ -41,17 +41,17 @@
std::set<int> *bus_set;
private:
- inline int _recvfrom_(void **buf, int *size, int *port, struct timespec *timeout, int flags);
- void _proxy_sub( char *topic, int port);
- void _proxy_pub( char *topic, size_t head_len, void *buf, size_t size, int port);
+ inline int _recvfrom_(void **buf, int *size, int *key, struct timespec *timeout, int flags);
+ void _proxy_sub( char *topic, int key);
+ void _proxy_pub( char *topic, size_t head_len, void *buf, size_t size, int key);
void *run_pubsub_proxy();
int parse_pubsub_topic(char *str, size_t size, char **_action, char **_topic, size_t *head_len );
- int _sub_( char *topic, int size, int port, struct timespec *timeout, int flags);
- int _pub_( char *topic, int topic_size, void *content, int content_size, int port, struct timespec *timeout, int flags);
+ int _sub_( char *topic, int size, int key, struct timespec *timeout, int flags);
+ int _pub_( char *topic, int topic_size, void *content, int content_size, int key, struct timespec *timeout, int flags);
- void _proxy_desub( char *topic, int port);
- void _proxy_desub_all(int port);
- int _desub_( char *topic, int size, int port, struct timespec *timeout, int flags);
+ void _proxy_desub( char *topic, int key);
+ void _proxy_desub_all(int key);
+ int _desub_( char *topic, int size, int key, struct timespec *timeout, int flags);
static void foreach_subscripters(std::function<void(SHMKeySet *, int)> cb);
static bool include_in_keys(int key, int keys[], size_t length);
@@ -66,49 +66,49 @@
* 缁戝畾绔彛鍒皊ocket, 濡傛灉涓嶇粦瀹氬垯绯荤粺鑷姩鍒嗛厤涓�涓�
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
- int bind(int port);
+ int bind(int key);
/**
* 寮哄埗缁戝畾绔彛鍒皊ocket, 閫傜敤浜庣▼搴忛潪姝ｅ父鍏抽棴鐨勬儏鍐典笅锛岄噸鍚▼搴忕粦瀹氬師鏉ヨ繕娌￠噴鏀剧殑key
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
- int force_bind(int port);
+ int force_bind(int key);
/**
* 鍙戦�佷俊鎭�
- * @port 鍙戦�佺粰璋�
+ * @key 鍙戦�佺粰璋�
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
- int sendto(const void *buf, const int size, const int port);
+ int sendto(const void *buf, const int size, const int key);
// 鍙戦�佷俊鎭秴鏃惰繑鍥炪�� @sec 绉� 锛� @nsec 绾崇
- int sendto_timeout(const void *buf, const int size, const int port, const struct timespec *timeout);
+ int sendto_timeout(const void *buf, const int size, const int key, const struct timespec *timeout);
// 鍙戦�佷俊鎭珛鍒昏繑鍥炪��
- int sendto_nowait(const void *buf, const int size, const int port);
+ int sendto_nowait(const void *buf, const int size, const int key);
/**
* 鎺ユ敹淇℃伅
- * @port 浠庤皝鍝噷鏀跺埌鐨勪俊鎭�
+ * @key 浠庤皝鍝噷鏀跺埌鐨勪俊鎭�
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
- int recvfrom(void **buf, int *size, int *port);
+ int recvfrom(void **buf, int *size, int *key);
// 鎺ュ彈淇℃伅瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
- int recvfrom_timeout(void **buf, int *size, int *port, struct timespec *timeout);
- int recvfrom_nowait(void **buf, int *size, int *port);
+ int recvfrom_timeout(void **buf, int *size, int *key, struct timespec *timeout);
+ int recvfrom_nowait(void **buf, int *size, int *key);
/**
* 鍙戦�佽姹備俊鎭苟绛夊緟鎺ユ敹搴旂瓟
- * @port 鍙戦�佺粰璋�
+ * @key 鍙戦�佺粰璋�
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
- int sendandrecv(const void *send_buf, const int send_size, const int port, void **recv_buf, int *recv_size) ;
+ int sendandrecv(const void *send_buf, const int send_size, const int key, void **recv_buf, int *recv_size) ;
// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
- int sendandrecv_timeout(const void *send_buf, const int send_size, const int port, void **recv_buf, int *recv_size, struct timespec *timeout) ;
- int sendandrecv_nowait(const void *send_buf, const int send_size, const int port, void **recv_buf, int *recv_size) ;
+ int sendandrecv_timeout(const void *send_buf, const int send_size, const int key, void **recv_buf, int *recv_size, struct timespec *timeout) ;
+ int sendandrecv_nowait(const void *send_buf, const int send_size, const int key, void **recv_buf, int *recv_size) ;
- int sendandrecv_unsafe(const void *send_buf, const int send_size, const int port, void **recv_buf, int *recv_size) ;
+ int sendandrecv_unsafe(const void *send_buf, const int send_size, const int key, void **recv_buf, int *recv_size) ;
// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
- int sendandrecv_unsafe_timeout(const void *send_buf, const int send_size, const int port, void **recv_buf, int *recv_size, struct timespec *timeout) ;
- int sendandrecv_unsafe_nowait(const void *send_buf, const int send_size, const int port, void **recv_buf, int *recv_size) ;
+ int sendandrecv_unsafe_timeout(const void *send_buf, const int send_size, const int key, void **recv_buf, int *recv_size, struct timespec *timeout) ;
+ int sendandrecv_unsafe_nowait(const void *send_buf, const int send_size, const int key, void **recv_buf, int *recv_size) ;
/**
@@ -122,35 +122,35 @@
* 璁㈤槄鎸囧畾涓婚
* @topic 涓婚
* @size 涓婚闀垮害
- * @port 鎬荤嚎绔彛
+ * @key 鎬荤嚎绔彛
*/
- int sub(char *topic, int size, int port);
+ int sub(char *topic, int size, int key);
// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
- int sub_timeout(char *topic, int size, int port, struct timespec *timeout);
- int sub_nowait(char *topic, int size, int port);
+ int sub_timeout(char *topic, int size, int key, struct timespec *timeout);
+ int sub_nowait(char *topic, int size, int key);
/**
* 鍙栨秷璁㈤槄鎸囧畾涓婚
* @topic 涓婚,涓婚涓虹┖鏃跺彇娑堝叏閮ㄨ闃�
* @size 涓婚闀垮害
- * @port 鎬荤嚎绔彛
+ * @key 鎬荤嚎绔彛
*/
- int desub( char *topic, int size, int port);
+ int desub( char *topic, int size, int key);
// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
- int desub_timeout(char *topic, int size, int port, struct timespec *timeout);
- int desub_nowait(char *topic, int size, int port) ;
+ int desub_timeout(char *topic, int size, int key, struct timespec *timeout);
+ int desub_nowait(char *topic, int size, int key) ;
/**
* 鍙戝竷涓婚
* @topic 涓婚
* @content 涓婚鍐呭
- * @port 鎬荤嚎绔彛
+ * @key 鎬荤嚎绔彛
*/
- int pub(char *topic, int topic_size, void *content, int content_size, int port);
+ int pub(char *topic, int topic_size, void *content, int content_size, int key);
// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
- int pub_timeout(char *topic, int topic_size, void *content, int content_size, int port, struct timespec *timeout);
- int pub_nowait(char *topic, int topic_size, void *content, int content_size, int port);
+ int pub_timeout(char *topic, int topic_size, void *content, int content_size, int key, struct timespec *timeout);
+ int pub_nowait(char *topic, int topic_size, void *content, int content_size, int key);
/**
diff --git a/src/socket/shm_socket.c b/src/socket/shm_socket.c
index 3041568..8fc4d94 100644
--- a/src/socket/shm_socket.c
+++ b/src/socket/shm_socket.c
@@ -79,8 +79,9 @@
int shm_listen(shm_socket_t *socket) {
if (socket->socket_type != SHM_SOCKET_STREAM) {
- err_exit(0, "can not invoke shm_listen method with a socket which is not a "
+ logger->error("can not invoke shm_listen method with a socket which is not a "
"SHM_SOCKET_STREAM socket");
+ exit(1);
}
int key;
@@ -109,8 +110,9 @@
*/
shm_socket_t *shm_accept(shm_socket_t *socket) {
if (socket->socket_type != SHM_SOCKET_STREAM) {
- err_exit(0, "can not invoke shm_accept method with a socket which is not a "
+ logger->error("can not invoke shm_accept method with a socket which is not a "
"SHM_SOCKET_STREAM socket");
+ exit(1);
}
hashtable_t *hashtable = mm_get_hashtable();
int client_key;
@@ -148,7 +150,7 @@
client_socket->status = SHM_CONN_ESTABLISHED;
return client_socket;
} else {
- err_msg(0, "shm_accept: 鍙戦�乷pen_reply澶辫触");
+ logger->error( "shm_accept: 鍙戦�乷pen_reply澶辫触");
return NULL;
}
@@ -161,12 +163,14 @@
int shm_connect(shm_socket_t *socket, int key) {
if (socket->socket_type != SHM_SOCKET_STREAM) {
- err_exit(0, "can not invoke shm_connect method with a socket which is not "
+ logger->error( "can not invoke shm_connect method with a socket which is not "
"a SHM_SOCKET_STREAM socket");
+ exit(1);
}
hashtable_t *hashtable = mm_get_hashtable();
if (hashtable_get(hashtable, key) == NULL) {
- err_exit(0, "shm_connect锛歝onnect at key %d failed!", key);
+ logger->error("shm_connect锛歝onnect at key %d failed!", key);
+ exit(1);
}
if (socket->key == -1) {
@@ -178,7 +182,8 @@
socket->queue = new SHMQueue<shm_msg_t>(socket->key, 16);
if ((socket->remoteQueue = _attach_remote_queue(key)) == NULL) {
- err_exit(0, "connect to %d failted", key);
+ logger->error("connect to %d failted", key);
+ exit(1);
}
socket->messageQueue = new LockFreeQueue<shm_msg_t, DM_Allocator>(16);
@@ -198,11 +203,13 @@
pthread_create(&(socket->dispatch_thread), NULL, _client_run_msg_rev,
(void *)socket);
} else {
- err_exit(0, "shm_connect: 涓嶅尮閰嶇殑搴旂瓟淇℃伅!");
+ logger->error( "shm_connect: 涓嶅尮閰嶇殑搴旂瓟淇℃伅!");
+ exit(1);
}
} else {
- err_exit(0, "connect failted!");
+ logger->error( "connect failted!");
+ exit(1);
}
return 0;
@@ -210,8 +217,9 @@
int shm_send(shm_socket_t *socket, const void *buf, const int size) {
if (socket->socket_type != SHM_SOCKET_STREAM) {
- err_exit(0, "can not invoke shm_send method with a socket which is not a "
+ logger->error("shm_socket.shm_send: can not invoke shm_send method with a socket which is not a "
"SHM_SOCKET_STREAM socket");
+ exit(1);
}
// hashtable_t *hashtable = mm_get_hashtable();
// if(socket->remoteQueue == NULL) {
@@ -228,16 +236,17 @@
if (socket->remoteQueue->push(dest)) {
return 0;
} else {
- err_msg(errno, "connection has been closed!");
+ logger->error(errno, "connection has been closed!");
return -1;
}
}
int shm_recv(shm_socket_t *socket, void **buf, int *size) {
if (socket->socket_type != SHM_SOCKET_STREAM) {
- err_exit(0, "can not invoke shm_recv method in a %d type socket which is "
+ logger->error( "shm_socket.shm_recv: can not invoke shm_recv method in a %d type socket which is "
"not a SHM_SOCKET_STREAM socket ",
socket->socket_type);
+ exit(1);
}
shm_msg_t src;
@@ -258,9 +267,10 @@
int shm_sendto(shm_socket_t *socket, const void *buf, const int size,
const int key, const struct timespec *timeout, const int flags) {
if (socket->socket_type != SHM_SOCKET_DGRAM) {
- err_exit(0, "Can't invoke shm_sendto method in a %d type socket which is "
+ logger->error( "shm_socket.shm_sendto: Can't invoke shm_sendto method in a %d type socket which is "
"not a SHM_SOCKET_DGRAM socket ",
socket->socket_type);
+ exit(0);
}
hashtable_t *hashtable = mm_get_hashtable();
@@ -278,13 +288,13 @@
SemUtil::inc(socket->mutex);
if (key == socket->key) {
- err_msg(0, "can not send to your self!");
+ logger->error( "can not send to your self!");
return -1;
}
SHMQueue<shm_msg_t> *remoteQueue;
if ((remoteQueue = _attach_remote_queue(key)) == NULL) {
- err_msg(0, "shm_sendto failed, the other end has been closed, or has not been opened!");
+ logger->error( "shm_sendto failed, the other end has been closed, or has not been opened!");
return SHM_SOCKET_ECONNFAILED;
}
@@ -312,7 +322,7 @@
} else {
delete remoteQueue;
mm_free(dest.buf);
- err_msg(errno, "sendto key %d failed!", key);
+ logger->error(errno, "sendto key %d failed!", key);
return -1;
}
}
@@ -320,9 +330,10 @@
// 鐭繛鎺ユ柟寮忔帴鍙�
int shm_recvfrom(shm_socket_t *socket, void **buf, int *size, int *key, struct timespec *timeout, int flags) {
if (socket->socket_type != SHM_SOCKET_DGRAM) {
- err_exit(0, "Can't invoke shm_recvfrom method in a %d type socket which "
+ logger->error("shm_socket.shm_recvfrom: Can't invoke shm_recvfrom method in a %d type socket which "
"is not a SHM_SOCKET_DGRAM socket ",
socket->socket_type);
+ exit(1);
}
hashtable_t *hashtable = mm_get_hashtable();
SemUtil::dec(socket->mutex);
@@ -367,9 +378,10 @@
const int send_size, const int send_key, void **recv_buf,
int *recv_size, struct timespec *timeout, int flags) {
if (socket->socket_type != SHM_SOCKET_DGRAM) {
- err_exit(0, "Can't invoke shm_sendandrecv method in a %d type socket "
+ logger->error( "shm_socket.shm_sendandrecv: Can't invoke shm_sendandrecv method in a %d type socket "
"which is not a SHM_SOCKET_DGRAM socket ",
socket->socket_type);
+ exit(1);
}
int recv_key;
int rv;
@@ -390,9 +402,10 @@
const int send_size, const int send_key, void **recv_buf,
int *recv_size, struct timespec *timeout, int flags) {
if (socket->socket_type != SHM_SOCKET_DGRAM) {
- err_exit(0, "Can't invoke shm_sendandrecv method in a %d type socket "
+ logger->error( "shm_socket.shm_sendandrecv_unsafe : Can't invoke shm_sendandrecv method in a %d type socket "
"which is not a SHM_SOCKET_DGRAM socket ",
socket->socket_type);
+ exit(1);
}
int recv_key;
int rv;
@@ -413,9 +426,10 @@
* 缁戝畾key鍒伴槦鍒楋紝浣嗘槸骞朵笉浼氬垱寤洪槦鍒椼�傚鏋滄病鏈夊搴旀寚瀹歬ey鐨勯槦鍒楁彁绀洪敊璇苟閫�鍑�
*/
SHMQueue<shm_msg_t> *_attach_remote_queue(int key) {
+
hashtable_t *hashtable = mm_get_hashtable();
if (hashtable_get(hashtable, key) == NULL) {
- err_msg(0, "_remote_queue_attach锛歝onnet at key %d failed!", key);
+ logger->error("shm_socket._remote_queue_attach锛歝onnet at key %d failed!", key);
return NULL;
}
@@ -467,7 +481,7 @@
break;
default:
- err_msg(0, "socket.__shm_rev__: undefined message type.");
+ logger->error("shm_socket._server_run_msg_rev: undefined message type.");
}
}
@@ -498,7 +512,7 @@
socket->messageQueue->push_timeout(src, &timeout);
break;
default:
- err_msg(0, "socket.__shm_rev__: undefined message type.");
+ logger->error( "shm_socket._client_run_msg_rev: undefined message type.");
}
}
diff --git a/src/socket/shm_stream_mod_socket.h b/src/socket/shm_stream_mod_socket.h
index 7af8fbc..9fd29a2 100644
--- a/src/socket/shm_stream_mod_socket.h
+++ b/src/socket/shm_stream_mod_socket.h
@@ -33,7 +33,7 @@
* 缁戝畾绔彛鍒皊ocket, 濡傛灉涓嶇粦瀹氬垯绯荤粺鑷姩鍒嗛厤涓�涓�
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
-int shm_stream_mod_socket_bind(void * _socket, int port);
+int shm_stream_mod_socket_bind(void * _socket, int key);
/**
@@ -45,7 +45,7 @@
/**
* 瀹㈡埛绔彂璧疯繛鎺ヨ姹�
*/
-int shm_stream_mod_socket_connect(void * _socket, int port);
+int shm_stream_mod_socket_connect(void * _socket, int key);
/**
* 鍙戦�佷俊鎭�
@@ -68,7 +68,7 @@
/**
* 鑾峰彇soket绔彛鍙�
*/
-int shm_stream_mod_socket_get_port(void * _socket);
+int shm_stream_mod_socket_get_key(void * _socket);
#ifdef __cplusplus
}
diff --git a/test_net_socket/net_mod_socket.sh b/test_net_socket/net_mod_socket.sh
index 4ae2223..d9f6096 100755
--- a/test_net_socket/net_mod_socket.sh
+++ b/test_net_socket/net_mod_socket.sh
@@ -1,12 +1,11 @@
function server() {
-# 寮�鍚痓us
+ # 寮�鍚痓us
./test_net_mod_socket --fun="start_bus_server" --key=8 & server_pid=$! && echo "pid: ${server_pid}"
-# 寮�鍚綉缁滆浆鍙戜唬鐞�
+ # 寮�鍚綉缁滆浆鍙戜唬鐞�
./test_net_mod_socket --fun="start_net_proxy" --port=5000 & server_pid=$! && echo "pid: ${server_pid}"
-
-# 鎵撳紑璇锋眰搴旂瓟娴嬭瘯鐨勬帴鍙楃
+ # 鎵撳紑璇锋眰搴旂瓟娴嬭瘯鐨勬帴鍙楃
./test_net_mod_socket --fun="start_reply" --key=11 & server_pid=$! && echo "pid: ${server_pid}"
}
@@ -31,7 +30,7 @@
}
function close() {
- ps -ef | grep -e "dgram_mod_req_rep" -e "net_mod_socket" -e "dgram_mod_bus" | awk '{print $2}' | xargs -i kill -9 {}
+ ps -ef | grep -e "test_net_mod_socket" -e "net_mod_socket"| awk '{print $2}' | xargs -i kill -9 {}
ipcrm -a
}
@@ -50,7 +49,6 @@
client
;;
"mclient")
-
mclient
;;
"close")
--
Gitblit v1.8.0