From df524e68ab5b5dc2c6ae9818c01baea2931b8d6b Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 26 一月 2021 17:11:59 +0800
Subject: [PATCH] update
---
src/socket/shm_mod_socket.h | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/socket/shm_mod_socket.h b/src/socket/shm_mod_socket.h
index 9ec3044..79b3247 100644
--- a/src/socket/shm_mod_socket.h
+++ b/src/socket/shm_mod_socket.h
@@ -12,6 +12,7 @@
#include "socket_def.h"
#define BUS_HEAD_SIZE (64 + 2 * sizeof(uint32_t))
+class BusServerSocket;
struct bus_head_t
{
@@ -22,19 +23,18 @@
class ShmModSocket {
+friend class BusServerSocket;
private:
shm_socket_t *shm_socket;
- socket_mod_t mod;
std::set<int> *bus_set;
private:
- inline int _recvfrom_(void **buf, int *size, int *key, struct timespec *timeout, int flags);
- int _sub_( char *topic, int size, int key, struct timespec *timeout, int flags);
- int _pub_( char *topic, int topic_size, void *content, int content_size, int key, struct timespec *timeout, int flags);
+ int _sub_( char *topic, int size, int key, const struct timespec *timeouts, int flags);
+ int _pub_( char *topic, int topic_size, void *content, int content_size, int key, const struct timespec *timeouts, int flags);
- int _desub_( char *topic, int size, int key, struct timespec *timeout, int flags);
+ int _desub_( char *topic, int size, int key, const struct timespec *timeouts, int flags);
static int get_bus_sendbuf(bus_head_t &request_head, void *topic_buf, int topic_size, void *content_buf, int content_size, void **retbuf);
@@ -80,7 +80,7 @@
*/
int recvfrom(void **buf, int *size, int *key);
// 鎺ュ彈淇℃伅瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
- int recvfrom_timeout(void **buf, int *size, int *key, struct timespec *timeout);
+ int recvfrom_timeout(void **buf, int *size, int *key, const struct timespec *timeout);
int recvfrom_nowait(void **buf, int *size, int *key);
/**
@@ -90,13 +90,13 @@
*/
int sendandrecv(const void *send_buf, const int send_size, const int key, void **recv_buf, int *recv_size) ;
// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
- int sendandrecv_timeout(const void *send_buf, const int send_size, const int key, void **recv_buf, int *recv_size, struct timespec *timeout) ;
+ int sendandrecv_timeout(const void *send_buf, const int send_size, const int key, void **recv_buf, int *recv_size, const struct timespec *timeout) ;
int sendandrecv_nowait(const void *send_buf, const int send_size, const int key, void **recv_buf, int *recv_size) ;
int sendandrecv_unsafe(const void *send_buf, const int send_size, const int key, void **recv_buf, int *recv_size) ;
// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
- int sendandrecv_unsafe_timeout(const void *send_buf, const int send_size, const int key, void **recv_buf, int *recv_size, struct timespec *timeout) ;
+ int sendandrecv_unsafe_timeout(const void *send_buf, const int send_size, const int key, void **recv_buf, int *recv_size, const struct timespec *timeout) ;
int sendandrecv_unsafe_nowait(const void *send_buf, const int send_size, const int key, void **recv_buf, int *recv_size) ;
/**
@@ -107,7 +107,7 @@
*/
int sub(char *topic, int size, int key);
// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
- int sub_timeout(char *topic, int size, int key, struct timespec *timeout);
+ int sub_timeout(char *topic, int size, int key, const struct timespec *timeout);
int sub_nowait(char *topic, int size, int key);
@@ -119,7 +119,7 @@
*/
int desub( char *topic, int size, int key);
// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
- int desub_timeout(char *topic, int size, int key, struct timespec *timeout);
+ int desub_timeout(char *topic, int size, int key, const struct timespec *timeout);
int desub_nowait(char *topic, int size, int key) ;
/**
@@ -130,7 +130,7 @@
*/
int pub(char *topic, int topic_size, void *content, int content_size, int key);
// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
- int pub_timeout(char *topic, int topic_size, void *content, int content_size, int key, struct timespec *timeout);
+ int pub_timeout(char *topic, int topic_size, void *content, int content_size, int key, const struct timespec *timeout);
int pub_nowait(char *topic, int topic_size, void *content, int content_size, int key);
--
Gitblit v1.8.0