From 42d1c7ef91627d5ac920c8fa35573970ac1bd2d5 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 15 一月 2021 16:27:55 +0800
Subject: [PATCH] Merge branch 'dev' into rdma
---
src/socket/net_mod_socket_wrapper.cpp | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/src/socket/net_mod_socket_wrapper.cpp b/src/socket/net_mod_socket_wrapper.cpp
index 4752db4..83161bc 100644
--- a/src/socket/net_mod_socket_wrapper.cpp
+++ b/src/socket/net_mod_socket_wrapper.cpp
@@ -2,12 +2,12 @@
+static Logger *logger = LoggerFactory::getLogger();
/**
* 鍒涘缓
*/
void * net_mod_socket_open() {
- printf("=====net_mod_socket_open\n");
NetModSocket *sockt = new NetModSocket;
return (void *)sockt;
}
@@ -16,48 +16,49 @@
* 鍏抽棴
*/
void net_mod_socket_close(void *_socket) {
- printf("====net_mod_socket_close\n");
NetModSocket *sockt = (NetModSocket *)_socket;
delete sockt;
}
-
-
/**
* 缁戝畾绔彛鍒皊ocket, 濡傛灉涓嶇粦瀹氬垯绯荤粺鑷姩鍒嗛厤涓�涓�
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
-int net_mod_socket_bind(void * _socket, int port){
+int net_mod_socket_bind(void * _socket, int key){
NetModSocket *sockt = (NetModSocket *)_socket;
- return sockt->bind(port);
+ return sockt->bind(key);
}
/**
* 寮哄埗缁戝畾绔彛鍒皊ocket, 閫傜敤浜庣▼搴忛潪姝ｅ父鍏抽棴鐨勬儏鍐典笅锛岄噸鍚▼搴忕粦瀹氬師鏉ヨ繕娌￠噴鏀剧殑key
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
-int net_mod_socket_force_bind(void * _socket, int port) {
+int net_mod_socket_force_bind(void * _socket, int key) {
NetModSocket *sockt = (NetModSocket *)_socket;
- return sockt->force_bind(port);
+ return sockt->force_bind(key);
}
+
/**
* 鍙戦�佷俊鎭�
- * @port 鍙戦�佺粰璋�
+ * @key 鍙戦�佺粰璋�
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
-int net_mod_socket_sendto(void *_socket, const void *buf, const int size, const int port) {
+int net_mod_socket_sendto(void *_socket, const void *buf, const int size, const int key) {
NetModSocket *sockt = (NetModSocket *)_socket;
- return sockt->sendto(buf, size, port);
+ logger->debug("net_mod_socket_sendto: %d sendto %d", net_mod_socket_get_key(_socket), key);
+ return sockt->sendto(buf, size, key);
}
// 鍙戦�佷俊鎭秴鏃惰繑鍥炪�� @sec 绉� 锛� @nsec 绾崇
-int net_mod_socket_sendto_timeout(void *_socket, const void *buf, const int size, const int port, int sec, int nsec){
+int net_mod_socket_sendto_timeout(void *_socket, const void *buf, const int size, const int key, int sec, int nsec){
NetModSocket *sockt = (NetModSocket *)_socket;
- return sockt->sendto_timeout(buf, size, port, sec, nsec);
+ logger->debug("net_mod_socket_sendto: %d sendto %d", net_mod_socket_get_key(_socket), key);
+ return sockt->sendto_timeout(buf, size, key, sec, nsec);
}
// 鍙戦�佷俊鎭珛鍒昏繑鍥炪��
-int net_mod_socket_sendto_nowait(void *_socket, const void *buf, const int size, const int port){
+int net_mod_socket_sendto_nowait(void *_socket, const void *buf, const int size, const int key){
NetModSocket *sockt = (NetModSocket *)_socket;
- return sockt->sendto_nowait(buf, size, port);
+ logger->debug("net_mod_socket_sendto: %d sendto %d", net_mod_socket_get_key(_socket), key);
+ return sockt->sendto_nowait(buf, size, key);
}
/**
@@ -65,18 +66,19 @@
* @port 浠庤皝鍝噷鏀跺埌鐨勪俊鎭�
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
-int net_mod_socket_recvfrom(void *_socket, void **buf, int *size, int *port){
+int net_mod_socket_recvfrom(void *_socket, void **buf, int *size, int *key){
NetModSocket *sockt = (NetModSocket *)_socket;
- return sockt->recvfrom(buf, size, port);
+ return sockt->recvfrom(buf, size, key);
}
// 鎺ュ彈淇℃伅瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
-int net_mod_socket_recvfrom_timeout(void *_socket, void **buf, int *size, int *port, int sec, int nsec){
+int net_mod_socket_recvfrom_timeout(void *_socket, void **buf, int *size, int *key, int sec, int nsec){
NetModSocket *sockt = (NetModSocket *)_socket;
- return sockt->recvfrom_timeout(buf, size, port, sec, nsec);
+ //return sockt->recvfrom(buf, size, key);
+ return sockt->recvfrom_timeout(buf, size, key, sec, nsec);
}
-int net_mod_socket_recvfrom_nowait(void *_socket, void **buf, int *size, int *port){
+int net_mod_socket_recvfrom_nowait(void *_socket, void **buf, int *size, int *key){
NetModSocket *sockt = (NetModSocket *)_socket;
- return sockt->recvfrom_nowait(buf, size, port);
+ return sockt->recvfrom_nowait(buf, size, key);
}
int net_mod_socket_sendandrecv(void *_socket, net_node_t *node_arr, int arrlen, void *send_buf, int send_size,
@@ -151,7 +153,6 @@
* 鍙栨秷璁㈤槄鎸囧畾涓婚
* @topic 涓婚,涓婚涓虹┖鏃跺彇娑堝叏閮ㄨ闃�
* @size 涓婚闀垮害
- * @port 鎬荤嚎绔彛
*/
int net_mod_socket_desub(void * _socket, void *topic, int size) {
NetModSocket *sockt = (NetModSocket *)_socket;
--
Gitblit v1.8.0