From 5e463316508fbb0bd79c8b4b68cd461b302a4da1 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 01 二月 2021 14:16:36 +0800
Subject: [PATCH] update
---
/dev/null | 73 -----
src/queue/shm_queue.h | 96 ++++--
src/net/net_mod_socket_wrapper.cpp | 10
test_net_socket/test_net_mod_socket.cpp | 2
src/logger_factory.cpp | 2
src/socket/shm_socket.h | 37 --
src/CMakeLists.txt | 2
src/shm/hashtable.h | 4
src/shm/hashtable.cpp | 54 ++--
src/socket/shm_socket.cpp | 476 +++++------------------------------
10 files changed, 180 insertions(+), 576 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f6202ca..00b6598 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,7 +10,6 @@
./logger_factory.cpp
./socket/bus_server_socket.cpp
./socket/bus_server_socket_wrapper.cpp
-./socket/shm_stream_mod_socket.cpp
./socket/shm_socket.cpp
./socket/shm_mod_socket.cpp
./time_util.cpp
@@ -52,7 +51,6 @@
./socket/socket_def.h
./socket/bus_server_socket.h
./socket/shm_socket.h
- ./socket/shm_stream_mod_socket.h
./socket/shm_mod_socket.h
./socket/bus_server_socket_wrapper.h
./psem.h
diff --git a/src/logger_factory.cpp b/src/logger_factory.cpp
index 001e7cc..48cd04b 100644
--- a/src/logger_factory.cpp
+++ b/src/logger_factory.cpp
@@ -17,7 +17,7 @@
#ifdef BUILD_Debug
config.console = 1;
#else
- config.console = 0;
+ config.console = 1;
#endif
logger = new Logger(config);
return logger;
diff --git a/src/net/net_mod_socket_wrapper.cpp b/src/net/net_mod_socket_wrapper.cpp
index 1dd2465..e8020a2 100644
--- a/src/net/net_mod_socket_wrapper.cpp
+++ b/src/net/net_mod_socket_wrapper.cpp
@@ -53,7 +53,8 @@
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;
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_timeout(buf, size, key, sec, nsec);
+ return sockt->sendto(buf, size, key);
}
// 鍙戦�佷俊鎭珛鍒昏繑鍥炪��
int net_mod_socket_sendto_nowait(void *_socket, const void *buf, const int size, const int key){
@@ -79,8 +80,8 @@
// 鎺ュ彈淇℃伅瓒呮椂杩斿洖銆� @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);
+ 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 *key){
NetModSocket *sockt = (NetModSocket *)_socket;
@@ -99,7 +100,8 @@
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){
NetModSocket *sockt = (NetModSocket *)_socket;
- 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);
+ // return sockt->sendandrecv_timeout(node_arr, arrlen, send_buf, send_size, recv_arr, recv_arr_size, timeout);
}
int net_mod_socket_sendandrecv_nowait(void *_socket, net_node_t *node_arr, int arrlen, void *send_buf, int send_size,
diff --git a/src/queue/shm_queue.h b/src/queue/shm_queue.h
index 104ea73..3a7750e 100644
--- a/src/queue/shm_queue.h
+++ b/src/queue/shm_queue.h
@@ -18,15 +18,22 @@
template <typename ELEM_T> class SHMQueue {
private:
- const int KEY;
+ const int mkey;
+ hashtable_t * hashtable;
+ // 鏄惁鏄痥ey瀵瑰簲鐨勫叡浜槦鍒楃殑鐪熸鎷ユ湁鑰咃紝涔熷氨鏄鏄痓ind鍒発ey涓婄殑锛屼笉鏄痑ttach鍒発ey涓婄殑瀵硅薄
+ bool owner;
+ size_t mqsize;
public:
/// @brief constructor of the class
- SHMQueue(int key = 0, size_t qsize = 16);
+ SHMQueue(size_t qsize = 16);
~SHMQueue();
- void force_destroy();
+ bool bind(int key, bool force) ;
+ bool attach(int key);
+
+ int get_key();
uint32_t size();
@@ -40,8 +47,6 @@
// @deprecate
static size_t remove_queues_exclude(int keys[], size_t length);
- static size_t remove_queues(int keys[], size_t length);
- static size_t remove_queue(int key);
private:
protected:
@@ -85,48 +90,66 @@
}
-template <typename ELEM_T>
-size_t SHMQueue<ELEM_T>::remove_queues(int keys[], size_t length) {
- hashtable_t *hashtable = mm_get_hashtable();
- LockFreeQueue<ELEM_T, SHM_Allocator> *mqueue;
- size_t count = 0;
- for(int i = 0; i< length; i++) {
- // 閿�姣佸叡浜唴瀛樼殑queue
- mqueue = (LockFreeQueue<ELEM_T, SHM_Allocator> *)mm_get_by_key(keys[i]);
- delete mqueue;
- hashtable_remove(hashtable, keys[i]);
- count++;
- }
- return count;
-}
template <typename ELEM_T>
-size_t SHMQueue<ELEM_T>::remove_queue(int key) {
- int keys[] = {key};
- return remove_queues(keys, 1);
-}
+SHMQueue<ELEM_T>::SHMQueue(size_t qsize): mqsize(qsize) {
-template <typename ELEM_T>
-SHMQueue<ELEM_T>::SHMQueue(int key, size_t qsize) : KEY(key) {
-
- hashtable_t *hashtable = mm_get_hashtable();
- queue = (LockFreeQueue<ELEM_T, SHM_Allocator> *)hashtable_get(hashtable, key);
- if (queue == NULL || (void *)queue == (void *)1) {
- queue = new LockFreeQueue<ELEM_T, SHM_Allocator>(qsize);
- hashtable_put(hashtable, key, (void *)queue);
- }
+ hashtable = mm_get_hashtable();
+ owner = false;
+ mkey = 0;
+ // queue = (LockFreeQueue<ELEM_T, SHM_Allocator> *)hashtable_get(hashtable, key);
+ // if (queue == NULL || (void *)queue == (void *)1) {
+ // queue = new LockFreeQueue<ELEM_T, SHM_Allocator>(qsize);
+ // hashtable_put(hashtable, key, (void *)queue);
+ // }
// queue->reference++;
// LoggerFactory::getLogger()->debug("SHMQueue constructor reference===%d", queue->reference.load());
}
template <typename ELEM_T> SHMQueue<ELEM_T>::~SHMQueue() {
LoggerFactory::getLogger()->debug("SHMQueue destroy");
- delete queue;
- queue = NULL;
- hashtable_t *hashtable = mm_get_hashtable();
- hashtable_remove(hashtable, KEY);
+ if(owner) {
+ delete queue;
+ hashtable_remove(hashtable, mkey);
+ }
+
}
+
+template <typename ELEM_T>
+bool SHMQueue<ELEM_T>::bind(int key, bool force) {
+
+
+ hashtable_lock(hashtable);
+ void *tmp_ptr = hashtable_get(hashtable, key);
+ if (tmp_ptr == NULL || tmp_ptr == (void *)1 || force) {
+ queue = new LockFreeQueue<ELEM_T, SHM_Allocator>(mqsize);
+ hashtable_put(hashtable, key, (void *)queue);
+ mkey = key;
+ owner = true;
+ hashtable_unlock(hashtable);
+ return true;
+ }
+
+ hashtable_unlock(hashtable);
+ return false;
+}
+
+template <typename ELEM_T>
+bool SHMQueue<ELEM_T>::attach(int key) {
+ void *tmp_ptr = hashtable_get(hashtable, key);
+ if (tmp_ptr == NULL || tmp_ptr == (void *)1) {
+ return false;
+ }
+ mkey = key;
+ queue = (LockFreeQueue<ELEM_T, SHM_Allocator> *)tmp_ptr;
+ return true;
+}
+
+template <typename ELEM_T> int SHMQueue<ELEM_T>::get_key() {
+ return mkey;
+}
+
template <typename ELEM_T> uint32_t SHMQueue<ELEM_T>::size() {
return queue->size();
@@ -140,6 +163,7 @@
return queue->empty();
}
+
template <typename ELEM_T>
diff --git a/src/shm/hashtable.cpp b/src/shm/hashtable.cpp
index cd2bd5a..7a5faf4 100755
--- a/src/shm/hashtable.cpp
+++ b/src/shm/hashtable.cpp
@@ -143,9 +143,6 @@
}
}
-
-
-
void *hashtable_get(hashtable_t *hashtable, int key) {
void * res = _hashtable_get(hashtable, key);
return res;
@@ -155,35 +152,36 @@
_hashtable_put(hashtable, key, value);
}
-// bool hashtable_put(hashtable_t *hashtable, int key, void *value, bool overwrite) {
+bool hashtable_check_put(hashtable_t *hashtable, int key, void *value, bool overwrite) {
-// int rv;
-// if(( rv = svsem_wait(hashtable->mutex)) != 0) {
-// LoggerFactory::getLogger()->error(errno, "hashtable_put\n");
-// }
-// if(overwrite) {
-// _hashtable_put(hashtable, key, value);
-// goto suc;
-// }
-// void * val = _hashtable_get(hashtable, key);
-// // val = 1鏄痑llockey鐨勬儏鍐�
-// if(val != NULL && val != (void *)1)
-// goto fail;
+ int rv;
+ void * val;
+ if(( rv = svsem_wait(hashtable->mutex)) != 0) {
+ LoggerFactory::getLogger()->error(errno, "hashtable_put\n");
+ }
+ if(overwrite) {
+ _hashtable_put(hashtable, key, value);
+ goto suc;
+ }
+ val = _hashtable_get(hashtable, key);
+ // val = 1鏄痑llockey鐨勬儏鍐�
+ if(val != NULL && val != (void *)1)
+ goto fail;
-// _hashtable_put(hashtable, key, value);
+ _hashtable_put(hashtable, key, value);
-// suc:
-// if(( rv = svsem_post(hashtable->mutex)) != 0) {
-// LoggerFactory::getLogger()->error(errno, "hashtable_put\n");
-// }
-// return true;
+suc:
+ if(( rv = svsem_post(hashtable->mutex)) != 0) {
+ LoggerFactory::getLogger()->error(errno, "hashtable_put\n");
+ }
+ return true;
-// fail:
-// if(( rv = svsem_post(hashtable->mutex)) != 0) {
-// LoggerFactory::getLogger()->error(errno, "hashtable_put\n");
-// }
-// return false;
-// }
+fail:
+ if(( rv = svsem_post(hashtable->mutex)) != 0) {
+ LoggerFactory::getLogger()->error(errno, "hashtable_put\n");
+ }
+ return false;
+}
diff --git a/src/shm/hashtable.h b/src/shm/hashtable.h
index e43029c..036745c 100755
--- a/src/shm/hashtable.h
+++ b/src/shm/hashtable.h
@@ -21,7 +21,9 @@
void hashtable_init(hashtable_t *hashtable);
void hashtable_destroy(hashtable_t *hashtable);
void *hashtable_get(hashtable_t *hashtable, int key);
-void hashtable_put(hashtable_t *hashtable, int key, void *value);
+void hashtable_put(hashtable_t *hashtable, int key, void *value) ;
+bool hashtable_check_put(hashtable_t *hashtable, int key, void *value, bool overwrite) ;
+
void *hashtable_remove(hashtable_t *hashtable, int key);
void hashtable_removeall(hashtable_t *hashtable);
diff --git a/src/socket/shm_socket.cpp b/src/socket/shm_socket.cpp
index 791311b..5df83a3 100644
--- a/src/socket/shm_socket.cpp
+++ b/src/socket/shm_socket.cpp
@@ -14,18 +14,15 @@
}
static pthread_once_t _once_ = PTHREAD_ONCE_INIT;
-static pthread_key_t _tmp_recv_socket_key_;
+static pthread_key_t _perthread_socket_key_;
-static void *_server_run_msg_rev(void *_socket);
-
-static void *_client_run_msg_rev(void *_socket);
+
static int _shm_close_dgram_socket(shm_socket_t *socket);
-static int _shm_close_stream_socket(shm_socket_t *socket, bool notifyRemote);
-static void _destrory_tmp_recv_socket_(void *tmp_socket);
-static void _create_tmp_recv_socket_key(void);
+static void _destrory_socket_perthread(void *tmp_socket);
+static void _create_socket_key_perthread(void);
// 妫�鏌ey鏄惁宸茬粡琚娇鐢紝鏄繑鍥�0, 鍚﹁繑鍥�1
// static int _shm_socket_check_key(shm_socket_t *socket) {
@@ -39,25 +36,53 @@
// }
// 妫�鏌ey鏄惁宸茬粡琚娇鐢紝 鏈浣跨敤鍒欑粦瀹歬ey
-static int check_and_bind_queue(shm_socket_t * sockt) {
+static LockFreeQueue<shm_msg_t> * shm_socket_bind_queue(int key, bool force) {
hashtable_t *hashtable = mm_get_hashtable();
+ LockFreeQueue<shm_msg_t> *queue;
hashtable_lock(hashtable);
- void *tmp_ptr = mm_get_by_key(sockt->key);
- if (tmp_ptr!= NULL && tmp_ptr != (void *)1 && !sockt->force_bind ) {
+ void *tmp_ptr = hashtable_get(hashtable, key);
+ if (tmp_ptr == NULL || tmp_ptr == (void *)1 || force ) {
+ queue = new LockFreeQueue<shm_msg_t>(16);
+ hashtable_put(hashtable, key, (void *)queue);
hashtable_unlock(hashtable);
- return EBUS_KEY_INUSED;
+ return queue;
}
- sockt->queue = new SHMQueue<shm_msg_t>(sockt->key, 16);
+
hashtable_unlock(hashtable);
- return 0;
+ return NULL;
}
-SHMQueue<shm_msg_t> *_attach_remote_queue(int key);
+/**
+ * 缁戝畾key鍒伴槦鍒楋紝浣嗘槸骞朵笉浼氬垱寤洪槦鍒椼��
+ */
+static LockFreeQueue<shm_msg_t> * shm_socket_attach_queue(int key) {
+ LockFreeQueue<shm_msg_t> * queue;
+ hashtable_t *hashtable = mm_get_hashtable();
+ // hashtable_lock(hashtable);
+ void *tmp_ptr = hashtable_get(hashtable, key);
+ if (tmp_ptr == NULL || tmp_ptr == (void *)1) {
+ //logger->error("shm_socket._remote_queue_attach锛歝onnet at key %d failed!", key);
+ return NULL;
+ }
+ queue = ( LockFreeQueue<shm_msg_t> *)tmp_ptr;
+ // hashtable_unlock(hashtable);
+ return queue;
+}
size_t shm_socket_remove_keys(int keys[], size_t length) {
- return SHMQueue<shm_msg_t>::remove_queues(keys, length);
+ hashtable_t *hashtable = mm_get_hashtable();
+ LockFreeQueue<shm_msg_t> *mqueue;
+ size_t count = 0;
+ for(int i = 0; i< length; i++) {
+ // 閿�姣佸叡浜唴瀛樼殑queue
+ mqueue = (LockFreeQueue<shm_msg_t> *)hashtable_get(hashtable, keys[i]);
+ delete mqueue;
+ hashtable_remove(hashtable, keys[i]);
+ count++;
+ }
+ return count;
}
shm_socket_t *shm_open_socket(shm_socket_type_t socket_type) {
@@ -69,8 +94,8 @@
socket->socket_type = socket_type;
socket->key = 0;
socket->force_bind = false;
- socket->dispatch_thread = 0;
- socket->status = SHM_CONN_CLOSED;
+ // socket->dispatch_thread = 0;
+
s = pthread_mutexattr_init(&mtxAttr);
if (s != 0)
@@ -91,19 +116,10 @@
int shm_close_socket(shm_socket_t *socket) {
- int ret, s;
+ int s;
logger->debug("shm_close_socket\n");
- switch (socket->socket_type) {
- case SHM_SOCKET_STREAM:
- ret = _shm_close_stream_socket(socket, true);
- break;
- case SHM_SOCKET_DGRAM:
- ret = _shm_close_dgram_socket(socket);
- break;
- default:
- break;
- }
+ _shm_close_dgram_socket(socket);
s = pthread_mutex_destroy(&(socket->mutex) );
if(s != 0) {
@@ -111,12 +127,12 @@
}
free(socket);
- return ret;
+ return 0;
}
// int shm_close_socket(shm_socket_t *socket) {
-// // _destrory_tmp_recv_socket_((shm_socket_t *)pthread_getspecific(_tmp_recv_socket_key_));
+// // _destrory_socket_perthread((shm_socket_t *)pthread_getspecific(_perthread_socket_key_));
// return shm_close_socket(socket);;
// }
@@ -136,200 +152,7 @@
return sk->key;
}
-int shm_listen(shm_socket_t *sockt) {
- int rv;
- if (sockt->socket_type != SHM_SOCKET_STREAM) {
- logger->error("can not invoke shm_listen method with a socket which is not a "
- "SHM_SOCKET_STREAM socket");
- exit(1);
- }
-
- int key;
- hashtable_t *hashtable = mm_get_hashtable();
- if (sockt->key == 0) {
- key = hashtable_alloc_key(hashtable);
- sockt->key = key;
- } else {
-
- rv = check_and_bind_queue(sockt);
- if(rv !=0 ) {
- return rv;
- }
- }
-
- sockt->queue = new SHMQueue<shm_msg_t>(sockt->key, 16);
- sockt->acceptQueue = new LockFreeQueue<shm_msg_t, DM_Allocator>(16);
- sockt->clientSocketMap = new std::map<int, shm_socket_t *>;
- sockt->status = SHM_CONN_LISTEN;
- pthread_create(&(sockt->dispatch_thread), NULL, _server_run_msg_rev,
- (void *)sockt);
-
- return 0;
-}
-
-/**
- * 鎺ュ彈瀹㈡埛绔缓绔嬫柊杩炴帴鐨勮姹�
- *
-*/
-shm_socket_t *shm_accept(shm_socket_t *sockt) {
- if (sockt->socket_type != SHM_SOCKET_STREAM) {
- 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;
- shm_socket_t *client_socket;
- shm_msg_t src;
-
- if (sockt->acceptQueue->pop(src) == 0) {
-
- // print_msg("===accept:", src);
- client_key = src.key;
- // client_socket = (shm_socket_t *)malloc(sizeof(shm_socket_t));
- client_socket = shm_open_socket(sockt->socket_type);
- client_socket->key = sockt->key;
- // client_socket->queue= socket->queue;
- //鍒濆鍖栨秷鎭痲ueue
- client_socket->messageQueue =
- new LockFreeQueue<shm_msg_t, DM_Allocator>(16);
- //杩炴帴鍒板鏂筿ueue
- client_socket->remoteQueue = _attach_remote_queue(client_key);
-
- sockt->clientSocketMap->insert({client_key, client_socket});
-
- /*
-* shm_accept 鐢ㄦ埛鎵ц鐨勬柟娉�
-* 涓巁server_run_msg_rev鍦ㄤ袱涓笉鍚岀殑闄愬埗宸ヤ綔,accept瑕佷繚璇佸湪瀹㈡埛鐨勫彂閫佹秷鎭箣鍓嶅畬鎴愯祫婧愮殑鍑嗗宸ヤ綔锛屼互閬垮厤鍑虹幇绔炴�侀棶棰�
- */
- //鍙戦�乷pen_reply,鍥炲簲瀹㈡埛绔殑connect璇锋眰
- struct timespec timeout = {1, 0};
- shm_msg_t msg;
- msg.key = sockt->key;
- msg.size = 0;
- msg.type = SHM_SOCKET_OPEN_REPLY;
-
- if (client_socket->remoteQueue->push(msg, &timeout, BUS_TIMEOUT_FLAG) == 0) {
- client_socket->status = SHM_CONN_ESTABLISHED;
- return client_socket;
- } else {
- logger->error( "shm_accept: 鍙戦�乷pen_reply澶辫触");
- return NULL;
- }
-
- } else {
- err_exit(errno, "shm_accept");
- }
- return NULL;
-}
-
-
-/**
- * @return 0鎴愬姛. 鍏朵粬鍊煎け璐�
- */
-int shm_connect(shm_socket_t *sockt, int key) {
- int rv;
- if (sockt->socket_type != SHM_SOCKET_STREAM) {
- 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) {
- logger->error("shm_connect锛歝onnect at key %d failed!", key);
- return -1;
- }
-
- if (sockt->key == 0) {
- sockt->key = hashtable_alloc_key(hashtable);
- sockt->queue = new SHMQueue<shm_msg_t>(sockt->key, 16);
- } else {
- rv = check_and_bind_queue(sockt);
- if(rv != 0 ) {
- return rv;
- }
- }
-
- if ((sockt->remoteQueue = _attach_remote_queue(key)) == NULL) {
- logger->error("connect to %d failted", key);
- return -1;
- }
- sockt->messageQueue = new LockFreeQueue<shm_msg_t, DM_Allocator>(16);
-
- //鍙戦�乷pen璇锋眰
- struct timespec timeout = {1, 0};
- shm_msg_t msg;
- msg.key = sockt->key;
- msg.size = 0;
- msg.type = SHM_SOCKET_OPEN;
- sockt->remoteQueue->push(msg, &timeout, BUS_TIMEOUT_FLAG);
-
- //鎺ュ彈open reply
- if (sockt->queue->pop(msg) == 0) {
- // 鍦ㄨ繖閲宻erver绔凡缁忓噯澶囧ソ鎺ュ彈瀹㈡埛绔彂閫佽姹備簡,瀹屾垚涓庢湇鍔＄鐨勮繛鎺�
- if (msg.type == SHM_SOCKET_OPEN_REPLY) {
- sockt->status = SHM_CONN_ESTABLISHED;
- pthread_create(&(sockt->dispatch_thread), NULL, _client_run_msg_rev,
- (void *)sockt);
- } else {
- logger->error( "shm_connect: 涓嶅尮閰嶇殑搴旂瓟淇℃伅!");
- exit(1);
- }
-
- } else {
- logger->error( "connect failted!");
- return -1;
- }
-
- return 0;
-}
-
-int shm_send(shm_socket_t *sockt, const void *buf, const int size) {
- if (sockt->socket_type != SHM_SOCKET_STREAM) {
- 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(sockt->remoteQueue == NULL) {
- err_msg(errno, "褰撳墠瀹㈡埛绔棤杩炴帴!");
- return -1;
- }
- shm_msg_t dest;
- dest.type = SHM_COMMON_MSG;
- dest.key = sockt->key;
- dest.size = size;
- dest.buf = mm_malloc(size);
- memcpy(dest.buf, buf, size);
-
- if (sockt->remoteQueue->push(dest) == 0) {
- return 0;
- } else {
- logger->error(errno, "connection has been closed!");
- return -1;
- }
-}
-
-int shm_recv(shm_socket_t *sockt, void **buf, int *size) {
- if (sockt->socket_type != SHM_SOCKET_STREAM) {
- 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 ",
- sockt->socket_type);
- exit(1);
- }
- shm_msg_t src;
-
- if (sockt->messageQueue->pop(src) == 0) {
- void *_buf = malloc(src.size);
- memcpy(_buf, src.buf, src.size);
- *buf = _buf;
- *size = src.size;
- mm_free(src.buf);
- return 0;
- } else {
- return -1;
- }
-}
+
// 鐭繛鎺ユ柟寮忓彂閫�
@@ -354,15 +177,11 @@
if (sockt->queue == NULL) {
if (sockt->key == 0) {
sockt->key = hashtable_alloc_key(hashtable);
- sockt->queue = new SHMQueue<shm_msg_t>(sockt->key, 16);
- } else {
- rv = check_and_bind_queue(sockt);
- if(rv !=0 ) {
- return rv;
- }
}
-
-
+ sockt->queue = shm_socket_bind_queue( sockt->key, sockt->force_bind);
+ if(sockt->queue == NULL ) {
+ return EBUS_KEY_INUSED;
+ }
}
if ((s = pthread_mutex_unlock(&(sockt->mutex))) != 0)
@@ -376,8 +195,8 @@
return EBUS_SENDTO_SELF;
}
- SHMQueue<shm_msg_t> *remoteQueue;
- if ((remoteQueue = _attach_remote_queue(key)) == NULL) {
+ LockFreeQueue<shm_msg_t> *remoteQueue;
+ if ((remoteQueue = shm_socket_attach_queue(key)) == NULL) {
bus_errno = EBUS_CLOSED;
logger->error("sendto key %d failed, %s", key, bus_strerror(bus_errno));
return EBUS_CLOSED;
@@ -397,7 +216,7 @@
return 0;
} else {
mm_free(dest.buf);
- logger->debug("%d sendto key %d failed %s", shm_socket_get_key(sockt), key, bus_strerror(rv));
+ logger->debug("====%d sendto key %d failed %s", shm_socket_get_key(sockt), key, bus_strerror(rv));
return rv;
}
}
@@ -422,12 +241,10 @@
if (sokt->queue == NULL) {
if (sokt->key == 0) {
sokt->key = hashtable_alloc_key(hashtable);
- sokt->queue = new SHMQueue<shm_msg_t>(sokt->key, 16);
- } else {
- rv = check_and_bind_queue(sokt);
- if(rv != 0 ) {
- return rv;
- }
+ }
+ sokt->queue = shm_socket_bind_queue( sokt->key, sokt->force_bind);
+ if(sokt->queue == NULL ) {
+ return EBUS_KEY_INUSED;
}
}
@@ -462,7 +279,7 @@
/* Free thread-specific data buffer */
-static void _destrory_tmp_recv_socket_(void *tmp_socket)
+static void _destrory_socket_perthread(void *tmp_socket)
{
int rv;
if(tmp_socket == NULL)
@@ -470,7 +287,7 @@
logger->debug("%d destroy tmp socket\n", pthread_self());
shm_close_socket((shm_socket_t *)tmp_socket);
- rv = pthread_setspecific(_tmp_recv_socket_key_, NULL);
+ rv = pthread_setspecific(_perthread_socket_key_, NULL);
if ( rv != 0) {
logger->error(rv, "shm_sendandrecv : pthread_setspecific");
exit(1);
@@ -478,14 +295,14 @@
}
/* One-time key creation function */
-static void _create_tmp_recv_socket_key(void)
+static void _create_socket_key_perthread(void)
{
int s;
/* Allocate a unique thread-specific data key and save the address
of the destructor for thread-specific data buffers */
- s = pthread_key_create(&_tmp_recv_socket_key_, _destrory_tmp_recv_socket_);
- //s = pthread_key_create(&_tmp_recv_socket_key_, NULL);
+ s = pthread_key_create(&_perthread_socket_key_, _destrory_socket_perthread);
+ //s = pthread_key_create(&_perthread_socket_key_, NULL);
if (s != 0) {
logger->error(s, "pthread_key_create");
abort(); /* dump core and terminate */
@@ -512,20 +329,20 @@
}
- rv = pthread_once(&_once_, _create_tmp_recv_socket_key);
+ rv = pthread_once(&_once_, _create_socket_key_perthread);
if (rv != 0) {
logger->error(rv, "shm_sendandrecv pthread_once");
exit(1);
}
- tmp_socket = (shm_socket_t *)pthread_getspecific(_tmp_recv_socket_key_);
+ tmp_socket = (shm_socket_t *)pthread_getspecific(_perthread_socket_key_);
if (tmp_socket == NULL)
{
/* If first call from this thread, allocate buffer for thread, and save its location */
logger->debug("%ld create tmp socket\n", (long)pthread_self() );
tmp_socket = shm_open_socket(SHM_SOCKET_DGRAM);
- rv = pthread_setspecific(_tmp_recv_socket_key_, tmp_socket);
+ rv = pthread_setspecific(_perthread_socket_key_, tmp_socket);
if ( rv != 0) {
logger->error(rv, "shm_sendandrecv : pthread_setspecific");
exit(1);
@@ -572,12 +389,16 @@
if ((rv = shm_sendto(tmp_socket, send_buf, send_size, send_key, timeout, flags)) == 0) {
rv = shm_recvfrom(tmp_socket, recv_buf, recv_size, &recv_key, timeout, flags);
- printf("======%d use tmp_socket %d, send to %d, receive from %d\n", shm_socket_get_key(sockt), shm_socket_get_key(tmp_socket), send_key, recv_key);
-
+
if(rv != 0) {
printf("_shm_sendandrecv_alloc_new : %s\n", bus_strerror(rv));
}
else if(rv == 0 ) {
+ printf("======%d use tmp_socket %d, send to %d, receive from %d\n", shm_socket_get_key(sockt), shm_socket_get_key(tmp_socket), send_key, recv_key);
+
+ if(recv_key == shm_socket_get_key(sockt)) {
+ printf("=====鏀跺埌浜嗚嚜宸卞彂缁欒嚜宸辩殑娑堟伅\n");
+ }
assert( send_key == recv_key);
if(send_key != recv_key) {
err_exit(0, "_shm_sendandrecv_alloc_new: send key expect to equal to recv key! send key =%d , recv key=%d", send_key, recv_key);
@@ -600,157 +421,8 @@
// ============================================================================================================
-
-/**
- * 缁戝畾key鍒伴槦鍒楋紝浣嗘槸骞朵笉浼氬垱寤洪槦鍒椼�傚鏋滄病鏈夊搴旀寚瀹歬ey鐨勯槦鍒楁彁绀洪敊璇苟閫�鍑�
- */
-SHMQueue<shm_msg_t> *_attach_remote_queue(int key) {
-
- hashtable_t *hashtable = mm_get_hashtable();
- if (hashtable_get(hashtable, key) == NULL) {
- //logger->error("shm_socket._remote_queue_attach锛歝onnet at key %d failed!", key);
- return NULL;
- }
-
- SHMQueue<shm_msg_t> *queue = new SHMQueue<shm_msg_t>(key, 0);
- return queue;
-}
-
-void _server_close_conn_to_client(shm_socket_t *socket, int key) {
- shm_socket_t *client_socket;
- std::map<int, shm_socket_t *>::iterator iter =
- socket->clientSocketMap->find(key);
- if (iter != socket->clientSocketMap->end()) {
- client_socket = iter->second;
- free((void *)client_socket);
- socket->clientSocketMap->erase(iter);
- }
-}
-
-/**
- * server绔悇绉嶇被鍨嬫秷鎭紙锛夊湪杩欓噷杩涚▼鍒嗘嫞
- */
-void *_server_run_msg_rev(void *_socket) {
- pthread_detach(pthread_self());
- shm_socket_t *socket = (shm_socket_t *)_socket;
- struct timespec timeout = {1, 0};
- shm_msg_t src;
- shm_socket_t *client_socket;
- std::map<int, shm_socket_t *>::iterator iter;
-
- while (socket->queue->pop(src) == 0) {
-
- switch (src.type) {
- case SHM_SOCKET_OPEN:
- socket->acceptQueue->push(src, &timeout, BUS_TIMEOUT_FLAG);
- break;
- case SHM_SOCKET_CLOSE:
- _server_close_conn_to_client(socket, src.key);
- break;
- case SHM_COMMON_MSG:
-
- iter = socket->clientSocketMap->find(src.key);
- if (iter != socket->clientSocketMap->end()) {
- client_socket = iter->second;
- // print_msg("_server_run_msg_rev push before", src);
- client_socket->messageQueue->push(src, &timeout, BUS_TIMEOUT_FLAG);
- // print_msg("_server_run_msg_rev push after", src);
- }
-
- break;
-
- default:
- logger->error("shm_socket._server_run_msg_rev: undefined message type.");
- }
- }
-
- return NULL;
-}
-
-void _client_close_conn_to_server(shm_socket_t *socket) {
-
- _shm_close_stream_socket(socket, false);
-}
-
-/**
- * client绔殑鍚勭绫诲瀷娑堟伅锛堬級鍦ㄨ繖閲岃繘绋嬪垎鎷�
- */
-void *_client_run_msg_rev(void *_socket) {
- pthread_detach(pthread_self());
- shm_socket_t *socket = (shm_socket_t *)_socket;
- struct timespec timeout = {1, 0};
- shm_msg_t src;
-
- while (socket->queue->pop(src) == 0) {
- switch (src.type) {
-
- case SHM_SOCKET_CLOSE:
- _client_close_conn_to_server(socket);
- break;
- case SHM_COMMON_MSG:
- socket->messageQueue->push(src, &timeout, BUS_TIMEOUT_FLAG);
- break;
- default:
- logger->error( "shm_socket._client_run_msg_rev: undefined message type.");
- }
- }
-
- return NULL;
-}
-
-int _shm_close_stream_socket(shm_socket_t *socket, bool notifyRemote) {
- socket->status = SHM_CONN_CLOSED;
- //缁欏鏂瑰彂閫佷竴涓叧闂繛鎺ョ殑娑堟伅
- struct timespec timeout = {1, 0};
- shm_msg_t close_msg;
-
- close_msg.key = socket->key;
- close_msg.size = 0;
- close_msg.type = SHM_SOCKET_CLOSE;
- if (notifyRemote && socket->remoteQueue != NULL) {
- socket->remoteQueue->push(close_msg, &timeout, BUS_TIMEOUT_FLAG);
- }
-
- if (socket->queue != NULL) {
- delete socket->queue;
- socket->queue = NULL;
- }
-
-
-
- if (socket->messageQueue != NULL) {
- delete socket->messageQueue;
- socket->messageQueue = NULL;
- }
-
- if (socket->acceptQueue != NULL) {
- delete socket->acceptQueue;
- socket->acceptQueue = NULL;
- }
-
- if (socket->clientSocketMap != NULL) {
- shm_socket_t *client_socket;
- for (auto iter = socket->clientSocketMap->begin();
- iter != socket->clientSocketMap->end(); iter++) {
- client_socket = iter->second;
-
- client_socket->remoteQueue->push(close_msg, &timeout, BUS_TIMEOUT_FLAG);
- client_socket->remoteQueue = NULL;
-
- delete client_socket->messageQueue;
- client_socket->messageQueue = NULL;
- free((void *)client_socket);
- }
- delete socket->clientSocketMap;
- }
-
- if (socket->dispatch_thread != 0)
- pthread_cancel(socket->dispatch_thread);
-
-
- return 0;
-
-}
+
+
int _shm_close_dgram_socket(shm_socket_t *socket){
if(socket->queue != NULL) {
diff --git a/src/socket/shm_socket.h b/src/socket/shm_socket.h
index 00e9035..15df610 100644
--- a/src/socket/shm_socket.h
+++ b/src/socket/shm_socket.h
@@ -6,14 +6,6 @@
#include "shm_queue.h"
#include "lock_free_queue.h"
-
-
-enum shm_connection_status_t {
- SHM_CONN_CLOSED=1,
- SHM_CONN_LISTEN=2,
- SHM_CONN_ESTABLISHED=3
-};
-
enum shm_socket_type_t
{
SHM_SOCKET_STREAM = 1,
@@ -47,13 +39,14 @@
int key;
bool force_bind;
pthread_mutex_t mutex;
- shm_connection_status_t status;
- SHMQueue<shm_msg_t> *queue; //self queue
- SHMQueue<shm_msg_t> *remoteQueue; // peer queue
- LockFreeQueue<shm_msg_t, DM_Allocator> *messageQueue;
- LockFreeQueue<shm_msg_t, DM_Allocator> *acceptQueue;
- std::map<int, shm_socket_t* > *clientSocketMap;
- pthread_t dispatch_thread;
+
+ LockFreeQueue<shm_msg_t> *queue; //self queue
+ LockFreeQueue<shm_msg_t> *remoteQueue; // peer queue
+ // shm_connection_status_t status;
+ // LockFreeQueue<shm_msg_t, DM_Allocator> *messageQueue;
+ // LockFreeQueue<shm_msg_t, DM_Allocator> *acceptQueue;
+ // std::map<int, shm_socket_t* > *clientSocketMap;
+ // pthread_t dispatch_thread;
} shm_socket_t;
@@ -70,19 +63,7 @@
int shm_socket_bind(shm_socket_t * socket, int key) ;
int shm_socket_force_bind(shm_socket_t * socket, int key) ;
-
-
-int shm_listen(shm_socket_t * socket) ;
-
-shm_socket_t* shm_accept(shm_socket_t* socket);
-
-int shm_connect(shm_socket_t * socket, int key);
-
-int shm_send(shm_socket_t * socket, const void *buf, const int size) ;
-
-
-int shm_recv(shm_socket_t * socket, void **buf, int *size) ;
-
+
/**
* @flags : BUS_NOWAIT_FLAG
*/
diff --git a/src/socket/shm_stream_mod_socket.cpp b/src/socket/shm_stream_mod_socket.cpp
deleted file mode 100644
index 4b948c9..0000000
--- a/src/socket/shm_stream_mod_socket.cpp
+++ /dev/null
@@ -1,201 +0,0 @@
-#include "usg_common.h"
-#include "shm_stream_mod_socket.h"
-#include "shm_socket.h"
-#include "shm_allocator.h"
-#include "mem_pool.h"
-#include "hashtable.h"
-#include "sem_util.h"
-#include "logger_factory.h"
-
-static Logger *logger = LoggerFactory::getLogger();
-
-typedef struct mod_entry_t
-{
- int size;
- void *buf;
- shm_socket_t *client_socket;
-}mod_entry_t;
-
-typedef struct shm_stream_mod_socket_t {
- socket_mod_t mod;
- shm_socket_t *shm_socket;
- shm_socket_t *client_socket;
- int is_server;
- LockFreeQueue<mod_entry_t, DM_Allocator> *recvQueue;
- int slots;
- int items;
-
-
-} shm_stream_mod_socket_t;
-
-/**
- *
- */
-void *shm_stream_mod_socket_open(int mod) {
- shm_stream_mod_socket_t *socket = (shm_stream_mod_socket_t *)malloc(sizeof(shm_stream_mod_socket_t));
- socket->shm_socket=shm_open_socket(SHM_SOCKET_STREAM);
- socket->is_server = 0;
- socket->mod = (socket_mod_t)mod;
- socket->recvQueue = new LockFreeQueue<mod_entry_t, DM_Allocator>(16);
- if (mod == REQ_REP) {
- socket->slots = SemUtil::get(IPC_PRIVATE, 1);
- socket->items = SemUtil::get(IPC_PRIVATE, 0);
- }
-
- return (void *)socket;
-}
-
-
-
-int shm_stream_mod_socket_close(void * _socket){
- shm_stream_mod_socket_t * socket = (shm_stream_mod_socket_t *) _socket;
-
- if (socket->mod == REQ_REP) {
- SemUtil::remove(socket->slots);
- SemUtil::remove(socket->items);
- }
-
- int rv = shm_close_socket(socket->shm_socket);
- free(_socket);
- return rv;
-}
-
-
-
-
-int shm_stream_mod_socket_bind(void * _socket, int key){
- shm_stream_mod_socket_t * socket = (shm_stream_mod_socket_t *) _socket;
- return shm_socket_bind(socket->shm_socket, key);
-}
-
-void * run_server_recv_client_msg(void *_socket) {
- pthread_detach(pthread_self());
- shm_stream_mod_socket_t * socket = (shm_stream_mod_socket_t *) _socket;
- shm_socket_t * client_socket = socket->client_socket;
-
- mod_entry_t entry;
- entry.client_socket = client_socket;
- while (socket->shm_socket->status == SHM_CONN_LISTEN &&
- client_socket->status == SHM_CONN_ESTABLISHED && shm_recv(client_socket, &entry.buf, &entry.size) == 0 ) {
-
- socket->recvQueue->push(entry);
- // shm_free(recvbuf);
- }
-
- free(_socket);
- shm_close_socket(client_socket);
- return NULL;
-}
-
-void *run_accept_connection(void * _socket) {
- shm_stream_mod_socket_t * socket = (shm_stream_mod_socket_t *) _socket;
- shm_socket_t *client_socket;
- pthread_t tid;
- while(socket->shm_socket->status == SHM_CONN_LISTEN) {
- //鎺ュ彈瀹㈡埛绔殑杩炴帴璇锋眰
- client_socket = shm_accept(socket->shm_socket);
-
- shm_stream_mod_socket_t *arg = (shm_stream_mod_socket_t *)malloc(sizeof(shm_stream_mod_socket_t));
- memcpy(arg, _socket, sizeof(shm_stream_mod_socket_t));
- arg->client_socket = client_socket;
- pthread_create(&tid, NULL, run_server_recv_client_msg , (void *)arg);
- }
- return NULL;
-}
-
-int shm_stream_mod_socket_listen(void * _socket) {
- shm_stream_mod_socket_t * socket = (shm_stream_mod_socket_t *) _socket;
- pthread_t tid;
- socket->is_server = 1;
- int rv = shm_listen(socket->shm_socket);
- if(rv == 0) {
- pthread_create(&tid, NULL, run_accept_connection, _socket);
- return 0;
- }
- return -1;
-}
-
-
-int shm_stream_mod_socket_connect(void * _socket, int key) {
- shm_stream_mod_socket_t * socket = (shm_stream_mod_socket_t *) _socket;
- return shm_connect(socket->shm_socket, key);
-
-}
-
-int shm_stream_mod_socket_send(void * _socket, const void *buf, const int size) {
- shm_stream_mod_socket_t * socket = (shm_stream_mod_socket_t *) _socket;
- std::map<int, shm_socket_t* > *clientSocketMap = socket->shm_socket->clientSocketMap;
- std::map<int, shm_socket_t* >::iterator iter;
- int rv;
- if(socket->is_server ) {
- switch(socket->mod) {
- case REQ_REP:
- SemUtil::dec(socket->items);
- rv = shm_send(socket->client_socket, buf, size);
- SemUtil::inc(socket->slots);
- break;
- case SURVEY:
- case PUB_SUB:
- for(iter = clientSocketMap->begin(); iter != clientSocketMap->end(); iter++) {
- rv = shm_send(iter->second, buf, size);
- }
- break;
- default:
- rv = shm_send(socket->client_socket, buf, size);
- }
- return rv;
-
- }
- else {
- rv = shm_send(socket->shm_socket, buf, size);
- return rv;
- }
- return -1;
-
-}
-
-int shm_stream_mod_socket_recv(void * _socket, void **buf, int *size) {
- shm_stream_mod_socket_t * socket = (shm_stream_mod_socket_t *) _socket;
- mod_entry_t entry;
-
- if(socket->is_server ) {
- switch(socket->mod) {
- case REQ_REP:
- SemUtil::dec(socket->slots);
- socket->recvQueue->pop(entry);
- *buf = entry.buf;
- *size = entry.size;
- socket->client_socket = entry.client_socket;
- SemUtil::inc(socket->items);
-
- break;
- case PUB_SUB:
- break;
- case SURVEY:
- default:
- socket->recvQueue->pop(entry);
- *buf = entry.buf;
- *size = entry.size;
-
- }
-
- return 0;
- }
- else {
- shm_recv(socket->shm_socket, buf, size);
- return 0;
- }
-
- return -1;
-}
-
-int shm_stream_mod_socket_get_key(void * _socket) {
- shm_stream_mod_socket_t * socket = (shm_stream_mod_socket_t *) _socket;
- return socket->shm_socket->key;
-}
-
-
-void shm_stream_mod_socket_free(void *buf) {
- free(buf);
-}
-
diff --git a/src/socket/shm_stream_mod_socket.h b/src/socket/shm_stream_mod_socket.h
deleted file mode 100644
index 305c2fd..0000000
--- a/src/socket/shm_stream_mod_socket.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#ifndef __shm_stream_mod_socket_SOCKET_H__
-#define __shm_stream_mod_socket_SOCKET_H__
-
-
-
-
-enum socket_mod_t
-{
- PULL_PUSH = 1,
- REQ_REP = 2,
- PAIR = 3,
- PUB_SUB = 4,
- SURVEY = 5,
- BUS = 6
-
-};
-
-/**
- * 鍒涘缓socket
- * @return socket鍦板潃
-*/
-void *shm_stream_mod_socket_open(int mod);
-
-/**
- * 鍏抽棴socket
- * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
-*/
-int shm_stream_mod_socket_close(void * _socket);
-
-/**
- * 缁戝畾绔彛鍒皊ocket, 濡傛灉涓嶇粦瀹氬垯绯荤粺鑷姩鍒嗛厤涓�涓�
- * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
-*/
-int shm_stream_mod_socket_bind(void * _socket, int key);
-
-
-/**
- * 鏈嶅姟绔紑鍚繛鎺ョ洃鍚�
- * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
- */
-int shm_stream_mod_socket_listen(void * _socket);
-
-/**
- * 瀹㈡埛绔彂璧疯繛鎺ヨ姹�
- */
-int shm_stream_mod_socket_connect(void * _socket, int key);
-
-/**
- * 鍙戦�佷俊鎭�
- * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
- */
-int shm_stream_mod_socket_send(void * _socket, const void *buf, const int size);
-
-/**
- * 鎺ユ敹淇℃伅
- * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
-*/
-int shm_stream_mod_socket_recv(void * _socket, void **buf, int *size) ;
-
-/**
- * 閲婃斁瀛樺偍鎺ユ敹淇℃伅鐨刡uf
- */
-void shm_stream_mod_socket_free(void *buf);
-
-
-/**
- * 鑾峰彇soket绔彛鍙�
- */
-int shm_stream_mod_socket_get_key(void * _socket);
-
-
-
-#endif
\ No newline at end of file
diff --git a/test_net_socket/test_net_mod_socket.cpp b/test_net_socket/test_net_mod_socket.cpp
index 9de375e..ca5fa3a 100644
--- a/test_net_socket/test_net_mod_socket.cpp
+++ b/test_net_socket/test_net_mod_socket.cpp
@@ -8,7 +8,7 @@
#include <getopt.h>
#include "logger_factory.h"
-#define SCALE 1000000
+#define SCALE 100000
typedef struct Targ {
net_node_t *node;
--
Gitblit v1.8.0