From 2561a007b8d8999a4750046d0cfb3b1ad5af50ac Mon Sep 17 00:00:00 2001 From: zhangmeng <775834166@qq.com> Date: 星期二, 09 四月 2024 15:29:32 +0800 Subject: [PATCH] test for perf --- src/net/net_mod_socket_wrapper.cpp | 140 +++++++++++++++++++++++++++++++++------------- 1 files changed, 100 insertions(+), 40 deletions(-) diff --git a/src/net/net_mod_socket_wrapper.cpp b/src/net/net_mod_socket_wrapper.cpp index be44751..8203a0a 100644 --- a/src/net/net_mod_socket_wrapper.cpp +++ b/src/net/net_mod_socket_wrapper.cpp @@ -20,6 +20,11 @@ delete sockt; } +int net_mod_socket_stop(void *_socket) { + NetModSocket *sockt = (NetModSocket *)_socket; + return sockt->stop(); +} + /** * 缁戝畾绔彛鍒皊ocket, 濡傛灉涓嶇粦瀹氬垯绯荤粺鑷姩鍒嗛厤涓�涓� * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜 @@ -35,8 +40,16 @@ */ int net_mod_socket_force_bind(void * _socket, int key) { NetModSocket *sockt = (NetModSocket *)_socket; - // return sockt->force_bind(key); - return sockt->bind(key); + return sockt->force_bind(key); + // return sockt->bind(key); +} + +int net_mod_socket_reg(void *_socket, void *pData, int len, void **buf, int *size, const int timeout_ms, int flag) +{ + NetModSocket *sockt = (NetModSocket *)_socket; + + return sockt->reg(pData, len, buf, size, timeout_ms, flag); + } /** @@ -44,24 +57,20 @@ * @key 鍙戦�佺粰璋� * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜 */ -int net_mod_socket_sendto(void *_socket, const void *buf, const int size, const int key) { +int net_mod_socket_sendto(void *_socket, const void *buf, const int size, const int key, int reset, int data_set) { NetModSocket *sockt = (NetModSocket *)_socket; - logger->debug("net_mod_socket_sendto: %d sendto %d", net_mod_socket_get_key(_socket), key); - return sockt->sendto(buf, size, key); + return sockt->sendto(buf, size, key, reset, data_set); } // 鍙戦�佷俊鎭秴鏃惰繑鍥炪�� @sec 绉� 锛� @nsec 绾崇 -int net_mod_socket_sendto_timeout(void *_socket, const void *buf, const int size, const int key, 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, int reset, int data_set){ NetModSocket *sockt = (NetModSocket *)_socket; - 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); - return sockt->sendto(buf, size, key); + return sockt->sendto_timeout(buf, size, key, sec, nsec, reset, data_set); + // return sockt->sendto(buf, size, key); } // 鍙戦�佷俊鎭珛鍒昏繑鍥炪�� -int net_mod_socket_sendto_nowait(void *_socket, const void *buf, const int size, const int key){ +int net_mod_socket_sendto_nowait(void *_socket, const void *buf, const int size, const int key, int reset, int data_set){ NetModSocket *sockt = (NetModSocket *)_socket; - logger->debug("net_mod_socket_sendto: %d sendto %d", net_mod_socket_get_key(_socket), key); - return sockt->sendto(buf, size, key); - // return sockt->sendto_nowait(buf, size, key); + return sockt->sendto_nowait(buf, size, key, reset, data_set); } /** @@ -69,51 +78,103 @@ * @port 浠庤皝鍝噷鏀跺埌鐨勪俊鎭� * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜 */ -int net_mod_socket_recvfrom(void *_socket, void **buf, int *size, int *key){ +int net_mod_socket_recvfrom(void *_socket, void **buf, int *size, int *key, int reset, int data_set){ int rv; NetModSocket *sockt = (NetModSocket *)_socket; - logger->debug(" %d net_mod_socket_recvfrom before", net_mod_socket_get_key(_socket)); - rv = sockt->recvfrom(buf, size, key); - logger->debug(" %d net_mod_socket_recvfrom after. rv = %d", net_mod_socket_get_key(_socket), rv); + rv = sockt->recvfrom(buf, size, key, reset, data_set); return rv; } + // 鎺ュ彈淇℃伅瓒呮椂杩斿洖銆� @sec 绉� 锛� @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(buf, size, key); - // return sockt->recvfrom_timeout(buf, size, key, sec, nsec); +int net_mod_socket_recvfrom_timeout(void *_socket, void **buf, int *size, int *key, int sec, int nsec, int reset, int data_set){ + NetModSocket *sockt = (NetModSocket *)_socket; + return sockt->recvfrom_timeout(buf, size, key, sec, nsec, reset, data_set); } -int net_mod_socket_recvfrom_nowait(void *_socket, void **buf, int *size, int *key){ - NetModSocket *sockt = (NetModSocket *)_socket; - return sockt->recvfrom(buf, size, key); - // return sockt->recvfrom_nowait(buf, size, key); + +int net_mod_socket_recvfrom_nowait(void *_socket, void **buf, int *size, int *key, int reset, int data_set){ + NetModSocket *sockt = (NetModSocket *)_socket; + return sockt->recvfrom_nowait(buf, size, key, reset, data_set); } int net_mod_socket_sendandrecv(void *_socket, net_node_t *node_arr, int arrlen, void *send_buf, int send_size, - net_mod_recv_msg_t ** recv_arr, int *recv_arr_size){ + net_mod_recv_msg_t ** recv_arr, int *recv_arr_size, net_mod_err_t ** err_arr, int *err_arr_size){ NetModSocket *sockt = (NetModSocket *)_socket; - return sockt->sendandrecv(node_arr, arrlen, send_buf, send_size, recv_arr, recv_arr_size); + return sockt->sendandrecv(node_arr, arrlen, send_buf, send_size, recv_arr, recv_arr_size, err_arr, err_arr_size, -1); } + +void net_mod_socket_int_set(void * _socket, int data) { + NetModSocket *sockt = (NetModSocket *)_socket; + sockt->int_set(data); +} + +void net_mod_socket_svr_set(void * _socket, int data) { + NetModSocket *sockt = (NetModSocket *)_socket; + sockt->svr_set(data); +} + +int net_mod_socket_int_get(void * _socket) { + NetModSocket *sockt = (NetModSocket *)_socket; + return sockt->int_get(); +} + +int net_mod_socket_svr_get(void * _socket) { + NetModSocket *sockt = (NetModSocket *)_socket; + return sockt->svr_get(); +} + +void net_mod_socket_buf_data_set(void * _socket, std::string str, int val) { + NetModSocket *sockt = (NetModSocket *)_socket; + sockt->buf_data_set(str, val); +} + +int net_mod_socket_buf_data_get(void * _socket, std::string str) { + NetModSocket *sockt = (NetModSocket *)_socket; + return sockt->buf_data_get(str); +} + +void net_mod_socket_buf_data_del(void * _socket, std::string str) { + NetModSocket *sockt = (NetModSocket *)_socket; + sockt->buf_data_del(str); +} + /** * 濡傛灉寤虹珛杩炴帴鐨勮妭鐐规病鏈夋帴鍙楀埌娑堟伅绛夊緟timeout鐨勬椂闂村悗杩斿洖 * @timeout 绛夊緟鏃堕棿锛屽崟浣嶆槸鍗冨垎涔嬩竴绉� */ int net_mod_socket_sendandrecv_timeout(void *_socket, net_node_t *node_arr, int arrlen, void *send_buf, int send_size, - net_mod_recv_msg_t ** recv_arr, int *recv_arr_size, int timeout){ + net_mod_recv_msg_t ** recv_arr, int *recv_arr_size, + net_mod_err_t ** err_arr, int *err_arr_size, int timeout){ NetModSocket *sockt = (NetModSocket *)_socket; - return sockt->sendandrecv(node_arr, arrlen, send_buf, send_size, recv_arr, recv_arr_size); - // return sockt->sendandrecv_timeout(node_arr, arrlen, send_buf, send_size, recv_arr, recv_arr_size, timeout); + return sockt->sendandrecv(node_arr, arrlen, send_buf, send_size, recv_arr, recv_arr_size, err_arr, err_arr_size, timeout); } int net_mod_socket_sendandrecv_nowait(void *_socket, net_node_t *node_arr, int arrlen, void *send_buf, int send_size, - net_mod_recv_msg_t ** recv_arr, int *recv_arr_size) { + net_mod_recv_msg_t ** recv_arr, int *recv_arr_size, net_mod_err_t ** err_arr, int *err_arr_size) { + NetModSocket *sockt = (NetModSocket *)_socket; - return sockt->sendandrecv(node_arr, arrlen, send_buf, send_size, recv_arr, recv_arr_size); - // return sockt->sendandrecv_nowait(node_arr, arrlen, send_buf, send_size, recv_arr, recv_arr_size); + return sockt->sendandrecv(node_arr, arrlen, send_buf, send_size, recv_arr, recv_arr_size, err_arr, err_arr_size, 0); } - + +int net_mod_socket_recvandsend(void *_socket, recvandsend_callback_wrapper_fn callback, void * user_data) { + NetModSocket *sockt = (NetModSocket *)_socket; + return sockt->recvandsend( callback, NULL, 0, user_data); + +} + +int net_mod_socket_recvandsend_timeout(void *_socket, recvandsend_callback_wrapper_fn callback, + int sec, int nsec, void * user_data) { + NetModSocket *sockt = (NetModSocket *)_socket; + struct timespec timeout = {sec, nsec}; + return sockt->recvandsend( callback, &timeout, BUS_TIMEOUT_FLAG, user_data); +} + +int net_mod_socket_recvandsend_nowait(void *_socket, recvandsend_callback_wrapper_fn callback, void * user_data) { + NetModSocket *sockt = (NetModSocket *)_socket; + return sockt->recvandsend( callback, NULL, BUS_NOWAIT_FLAG, user_data); +} + /** * 鍚憂ode_arr 涓殑鎵�鏈夌綉缁滆妭鐐瑰彂甯冩秷鎭� @@ -122,15 +183,15 @@ * @content 鍐呭锛孈content_size 鍐呭闀垮害 * @return 鎴愬姛鍙戝竷鐨勮妭鐐圭殑涓暟 */ -int net_mod_socket_pub(void *_socket, net_node_t *node_arr, int node_arr_len, char *topic, int topic_size, void *content, int content_size) { +int net_mod_socket_pub(void *_socket, net_node_t *node_arr, int node_arr_len, const char *topic, int topic_size, const void *content, int content_size) { NetModSocket *sockt = (NetModSocket *)_socket; return sockt->pub(node_arr, node_arr_len, topic, topic_size, content, content_size); } -int net_mod_socket_pub_timeout(void *_socket, net_node_t *node_arr, int node_arr_len, char *topic, int topic_size, void *content, int content_size, int msec){ +int net_mod_socket_pub_timeout(void *_socket, net_node_t *node_arr, int node_arr_len, const char *topic, int topic_size, const void *content, int content_size, int msec){ NetModSocket *sockt = (NetModSocket *)_socket; return sockt->pub_timeout(node_arr, node_arr_len, topic, topic_size, content, content_size, msec); } -int net_mod_socket_pub_nowait(void *_socket, net_node_t *node_arr, int node_arr_len, char *topic, int topic_size, void *content, int content_size){ +int net_mod_socket_pub_nowait(void *_socket, net_node_t *node_arr, int node_arr_len, const char *topic, int topic_size, const void *content, int content_size){ NetModSocket *sockt = (NetModSocket *)_socket; return sockt->pub_nowait(node_arr, node_arr_len, topic, topic_size, content, content_size); } @@ -212,10 +273,9 @@ int shm_mod_socket_remove_keys(int keys[], int length){ - return ShmModSocket::remove_keys(keys, length); + return 0; } int shm_mod_socket_remove_key(int key){ - int keys[] = {key}; - return ShmModSocket::remove_keys(keys, 1); + return 0; } -- Gitblit v1.8.0