From 46963c736e76cc0e23e361d7a59bbf95da3e8419 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期四, 23 七月 2020 16:36:41 +0800
Subject: [PATCH] hear beat
---
src/socket/dgram_mod_socket.c | 93 +---------------------------------------------
1 files changed, 2 insertions(+), 91 deletions(-)
diff --git a/src/socket/dgram_mod_socket.c b/src/socket/dgram_mod_socket.c
index 5b24fc7..4dac9e8 100644
--- a/src/socket/dgram_mod_socket.c
+++ b/src/socket/dgram_mod_socket.c
@@ -28,18 +28,6 @@
int dgram_mod_close_socket(void * _socket) {
dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
shm_close_socket(socket->shm_socket);
- // if(socket->recv_queue_map != NULL) {
- // for(auto iter = socket->recv_queue_map->begin(); iter != socket->recv_queue_map->end(); iter++) {
- // delete iter->second;
- // socket->recv_queue_map->erase(iter);
-
- // }
- // delete socket->recv_queue_map;
- // }
-
-
- // if(socket->recv_thread != 0)
- // pthread_cancel(socket->recv_thread);
free(_socket);
}
@@ -58,90 +46,13 @@
int dgram_mod_recvfrom(void *_socket, void **buf, int *size, int *port) {
dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
- // if(socket->mod == REQ_REP && socket->recv_thread != 0) {
- // err_exit(0, "you have used sendandrecv method os you can not use recvfrom method any more. these two method can not be used at the same time.");
- // return -1;
- // }
return shm_recvfrom(socket->shm_socket, buf, size, port);
}
-
-// void *_dgram_mod_run_recv(void * _socket) {
-// pthread_detach(pthread_self());
-// dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
-// void *buf;
-// int size;
-// int port;
-// shm_msg_t msg;
-// LockFreeQueue<shm_msg_t, DM_Allocator> *queue;
-// std::map<int, LockFreeQueue<shm_msg_t, DM_Allocator> * >::iterator iter;
-// // printf("==============_dgram_mod_run_recv recv before\n");
-// while(shm_recvfrom(socket->shm_socket, &buf, &size, &port) == 0) {
-// if( (iter = socket->recv_queue_map->find(port) ) != socket->recv_queue_map->end()) {
-// queue = iter->second;
-// } else {
-// queue = new LockFreeQueue<shm_msg_t, DM_Allocator>(16);
-// socket->recv_queue_map->insert({port, queue});
-// }
-
-// msg.buf = buf;
-// msg.size = size;
-// msg.port = port;
-// // printf("==============_dgram_mod_run_recv push before\n");
-// queue->push(msg);
-// // printf("==============_dgram_mod_run_recv push after\n");
-
-// }
-// return NULL;
-
-
-
-// }
-
+
int dgram_mod_sendandrecv(void * _socket, const void *send_buf, const int send_size, const int send_port, void **recv_buf, int *recv_size) {
-
dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
- if(socket->mod != REQ_REP) {
- err_exit(0, "you can't use this method other than REQ_REP mod!");
- }
- // if(socket->recv_queue_map == NULL) {
- // socket->recv_queue_map = new std::map<int, LockFreeQueue<shm_msg_t, DM_Allocator> * >;
- // }
-
- // std::map<int, LockFreeQueue<shm_msg_t, DM_Allocator> * >::iterator iter;
- // LockFreeQueue<shm_msg_t, DM_Allocator> *queue;
- // if( (iter = socket->recv_queue_map->find(port) ) != socket->recv_queue_map->end()) {
- // queue = iter->second;
- // } else {
- // queue = new LockFreeQueue<shm_msg_t, DM_Allocator>(16);
- // socket->recv_queue_map->insert({port, queue});
- // }
-
- // if (socket->recv_thread == 0) {
-
- // pthread_create(&(socket->recv_thread ), NULL, _dgram_mod_run_recv , _socket);
-
- // }
-
- // shm_msg_t msg;
- // if(queue->pop(msg)) {
- // *recv_buf = msg.buf;
- // *recv_size = msg.size;
- // return 0;
- // }
-
- int recv_port;
- int rv;
-
- shm_socket_t *shm_socket = shm_open_socket(SHM_SOCKET_DGRAM);
- if (shm_sendto(shm_socket, send_buf, send_size, send_port) == 0) {
- rv = shm_recvfrom(shm_socket, recv_buf, recv_size, &recv_port);
- shm_close_socket(shm_socket);
- return rv;
- }
-
-
- return -1;
+ return shm_sendandrecv(socket->shm_socket, send_buf, send_size, send_port, recv_buf, recv_size);
}
\ No newline at end of file
--
Gitblit v1.8.0