From 00dba6082e245d917cb7d6eed3c627211ff41cd7 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 25 九月 2020 15:53:21 +0800
Subject: [PATCH] update

---
 src/socket/dgram_mod_socket.c |  218 ++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 187 insertions(+), 31 deletions(-)

diff --git a/src/socket/dgram_mod_socket.c b/src/socket/dgram_mod_socket.c
index 4dac9e8..0f988b5 100644
--- a/src/socket/dgram_mod_socket.c
+++ b/src/socket/dgram_mod_socket.c
@@ -1,58 +1,214 @@
-#include "usg_common.h"
 #include "dgram_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"
+#include "dmod_socket.h"
 
 typedef struct dgram_mod_socket_t {
-	socket_mod_t mod;
-  shm_socket_t *shm_socket;
-  // pthread_t recv_thread;
-	// std::map<int, LockFreeQueue<shm_msg_t, DM_Allocator> * > *recv_queue_map;
+  DModSocket *m_socket;
+  
 } dgram_mod_socket_t;
 
 
-void *dgram_mod_open_socket(int mod) {
+int dgram_mod_remove_keys(int keys[], int length){
+	return DModSocket::remove_keys(keys, length);
+}
+
+int dgram_mod_remove_key(int key){
+	int keys[] = {key};
+	return DModSocket::remove_keys(keys, 1);
+}
+/**
+ * 鍒涘缓socket
+ * @return socket鍦板潃
+*/
+void *dgram_mod_open_socket() {
 	dgram_mod_socket_t * socket = (dgram_mod_socket_t *)calloc(1, sizeof(dgram_mod_socket_t));
-	socket->mod = (socket_mod_t)mod;
-	// socket->recv_thread = 0;
-	// socket->recv_queue_map = NULL;
-	socket->shm_socket = shm_open_socket(SHM_SOCKET_DGRAM);
+	// socket->mod = (socket_mod_t)mod;
+	socket->m_socket = new DModSocket;
 	return (void *)socket;
 }
 
-
+/**
+ * 鍏抽棴socket
+ * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
+*/
 int dgram_mod_close_socket(void * _socket) {
 	dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
-	shm_close_socket(socket->shm_socket);
+	delete socket->m_socket;
 	free(_socket);
+	return 0;
 }
 
-
-int dgram_mod_bind(void * _socket, int port){
+/**
+ * 缁戝畾绔彛鍒皊ocket, 濡傛灉涓嶇粦瀹氬垯绯荤粺鑷姩鍒嗛厤涓�涓�
+ * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
+*/
+int dgram_mod_bind(void * _socket, int port) {
 	dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
-	return  shm_socket_bind(socket->shm_socket, port);
+	return socket->m_socket->bind(port);
 }
 
-int dgram_mod_sendto(void *_socket, const void *buf, const int size, const int port) {
+/**
+ * 寮哄埗缁戝畾绔彛鍒皊ocket, 閫傜敤浜庣▼搴忛潪姝e父鍏抽棴鐨勬儏鍐典笅锛岄噸鍚▼搴忕粦瀹氬師鏉ヨ繕娌¢噴鏀剧殑key
+ * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
+*/
+int dgram_mod_force_bind(void * _socket, int port) {
 	dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
-	return shm_sendto(socket->shm_socket, buf, size, port);
-
+	return socket->m_socket->force_bind(port);
+}
+/**
+ * 鍙戦�佷俊鎭�
+ * @port 鍙戦�佺粰璋�
+ * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
+ */
+int dgram_mod_sendto(void *_socket, const void *buf, const int size, const int port){
+	dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+	return socket->m_socket->sendto(buf, size,port);
 }
 
+// 鍙戦�佷俊鎭秴鏃惰繑鍥炪�� @sec 绉� 锛� @nsec 绾崇
+int dgram_mod_sendto_timeout(void *_socket, const void *buf, const int size, const int port, int sec, int nsec){
+	dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+	struct timespec timeout = {sec, nsec};
+	return socket->m_socket->sendto_timeout(buf, size, port, &timeout);
+}
+
+// 鍙戦�佷俊鎭珛鍒昏繑鍥炪��
+int dgram_mod_sendto_nowait(void *_socket, const void *buf, const int size, const int port){
+	dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+	return socket->m_socket->sendto_nowait(buf, size,port);
+}
+
+/**
+ * 鎺ユ敹淇℃伅
+ * @port 浠庤皝鍝噷鏀跺埌鐨勪俊鎭�
+ * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
+*/
 int dgram_mod_recvfrom(void *_socket, void **buf, int *size, int *port) {
-
 	dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
-	return shm_recvfrom(socket->shm_socket, buf, size, port);
+	return socket->m_socket->recvfrom(buf, size, port);
 }
- 
-
-
-int dgram_mod_sendandrecv(void * _socket, const void *send_buf, const int send_size, const int send_port, void **recv_buf, int *recv_size) {
+// 鎺ュ彈淇℃伅瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
+int dgram_mod_recvfrom_timeout(void *_socket, void **buf, int *size, int *port, int sec, int nsec){
 	dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
-	return shm_sendandrecv(socket->shm_socket, send_buf, send_size, send_port, recv_buf, recv_size);
+	struct timespec timeout = {sec, nsec};
+	return socket->m_socket->recvfrom_timeout(buf, size, port, &timeout);
+}
 
+int dgram_mod_recvfrom_nowait(void *_socket, void **buf, int *size, int *port){
+	dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+	return socket->m_socket->recvfrom_nowait(buf, size, port);
+}
+
+/**
+ * 鍙戦�佽姹備俊鎭苟绛夊緟鎺ユ敹搴旂瓟
+ * @port 鍙戦�佺粰璋�
+ * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
+*/
+int dgram_mod_sendandrecv(void * _socket, const void *send_buf, const int send_size, const int port, void **recv_buf, int *recv_size){
+	dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+	return socket->m_socket->sendandrecv(send_buf, send_size, port, recv_buf, recv_size);
+}
+// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
+int dgram_mod_sendandrecv_timeout(void * _socket, const void *send_buf, const int send_size, const int port, void **recv_buf, int *recv_size, int sec, int nsec){
+	dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+	struct timespec timeout = {sec, nsec};
+	return socket->m_socket->sendandrecv_timeout(send_buf, send_size, port, recv_buf, recv_size, &timeout);
+}
+int dgram_mod_sendandrecv_nowait(void * _socket, const void *send_buf, const int send_size, const int port, void **recv_buf, int *recv_size) {
+	dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+	return socket->m_socket->sendandrecv_nowait(send_buf, send_size, port, recv_buf, recv_size);
+}
+
+
+/**
+ * 鍚姩bus
+ * 
+ * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
+*/
+int  dgram_mod_start_bus(void * _socket) {
+	dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+	return socket->m_socket->start_bus();
+}
+
+/**
+ * 璁㈤槄鎸囧畾涓婚
+ * @topic 涓婚
+ * @size 涓婚闀垮害
+ * @port 鎬荤嚎绔彛
+ */
+int  dgram_mod_sub(void * _socket, void *topic, int size, int port){
+	dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+	return socket->m_socket->sub((char *)topic,  size,  port);
+}
+// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
+int  dgram_mod_sub_timeout(void * _socket, void *topic, int size, int port, int sec, int nsec){
+	dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+	struct timespec timeout = {sec, nsec};
+	return socket->m_socket->sub_timeout((char *)topic,  size,  port, &timeout);
+}
+int  dgram_mod_sub_nowait(void * _socket, void *topic, int size, int port){
+	dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+	return socket->m_socket->sub_nowait((char *)topic,  size,  port);
+}
+
+
+
+/**
+ * 鍙栨秷璁㈤槄鎸囧畾涓婚
+ * @topic 涓婚
+ * @size 涓婚闀垮害
+ * @port 鎬荤嚎绔彛
+ */
+int  dgram_mod_desub(void * _socket, void *topic, int size, int port){
+	dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+	return socket->m_socket->desub((char *)topic,  size,  port);
+}
+// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
+int  dgram_mod_desub_timeout(void * _socket, void *topic, int size, int port, int sec, int nsec){
+	dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+	struct timespec timeout = {sec, nsec};
+	return socket->m_socket->desub_timeout((char *)topic,  size,  port, &timeout);
+}
+int  dgram_mod_desub_nowait(void * _socket, void *topic, int size, int port){
+	dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+	return socket->m_socket->desub_nowait((char *)topic,  size,  port);
+}
+
+
+
+/**
+ * 鍙戝竷涓婚
+ * @topic 涓婚
+ * @content 涓婚鍐呭
+ * @port 鎬荤嚎绔彛
+ */
+int  dgram_mod_pub(void * _socket, void *topic, int topic_size, void *content, int content_size, int port){
+	dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+	return socket->m_socket->pub((char *)topic, topic_size, content, content_size, port);
+}
+//  瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
+int  dgram_mod_pub_timeout(void * _socket, void *topic, int topic_size, void *content, int content_size, int port, int sec, int nsec){
+	dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+	struct timespec timeout = {sec, nsec};
+	return socket->m_socket->pub_timeout((char *)topic, topic_size, content, content_size, port, &timeout);
+}
+int  dgram_mod_pub_nowait(void * _socket, void *topic, int topic_size, void *content, int content_size, int port){
+	dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+	return socket->m_socket->pub_nowait((char *)topic, topic_size, content, content_size, port);
+}
+
+
+/**
+ * 鑾峰彇soket绔彛鍙�
+ */
+int dgram_mod_get_port(void * _socket) {
+	dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+	return socket->m_socket->get_port();
+}
+
+
+/**
+ * 閲婃斁瀛樺偍鎺ユ敹淇℃伅鐨刡uf
+ */
+void dgram_mod_free(void *buf) {
+	free(buf);
 }
\ No newline at end of file

--
Gitblit v1.8.0