From dc01e4cbb01e96d19b470a366bbe648d426ed171 Mon Sep 17 00:00:00 2001
From: fujuntang <fujuntang@smartai.com>
Date: 星期六, 11 九月 2021 10:06:15 +0800
Subject: [PATCH] Add topics sub and request support.
---
src/bh_api.cpp | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/src/bh_api.cpp b/src/bh_api.cpp
index 4f623f8..d25bf8a 100644
--- a/src/bh_api.cpp
+++ b/src/bh_api.cpp
@@ -139,6 +139,12 @@
gNetmod_socket = net_mod_socket_open();
hashtable_t *hashtable = mm_get_hashtable();
key = hashtable_alloc_key(hashtable);
+ count = hashtable_alloc_key(hashtable);
+ rv = hashtable_alloc_key(hashtable);
+ net_mod_socket_int_set(gNetmod_socket, count);
+ net_mod_socket_svr_set(gNetmod_socket, rv);
+ sprintf(pData.int_info, "%d", count);
+ sprintf(pData.svr_info, "%d", rv);
net_mod_socket_bind(gNetmod_socket, key);
rv = net_mod_socket_reg(gNetmod_socket, &pData, sizeof(ProcInfo), NULL, 0, timeout_ms, PROC_REG);
@@ -932,8 +938,8 @@
::bhome_msg::MsgCommonReply mcr;
mcr.mutable_errmsg()->set_errcode(::bhome_msg::ErrorCode(rv));
mcr.mutable_errmsg()->set_errstring(errString);
- *reply_len=mcr.ByteSizeLong();
- *reply=malloc(*reply_len);
+ *reply_len = mcr.ByteSizeLong();
+ *reply = malloc(*reply_len);
mcr.SerializePartialToArray(*reply,*reply_len);
#endif
@@ -1207,6 +1213,7 @@
int val;
int len;
int min;
+ int data;
int sec, nsec;
std::string MsgID;
int timeout_ms = 3000;
@@ -1309,20 +1316,21 @@
strncpy(topics_buf + strlen(buf_temp) + 1, _input1.data, strlen(_input1.data));
#endif
+ data = net_mod_socket_svr_get(gNetmod_socket);
if (timeout_ms > 0) {
sec = timeout_ms / 1000;
nsec = (timeout_ms - sec * 1000) * 1000 * 1000;
- rv = net_mod_socket_sendto_timeout(gNetmod_socket, topics_buf, len, val, sec, nsec);
+ rv = net_mod_socket_sendto_timeout(gNetmod_socket, topics_buf, len, val, sec, nsec, SVR_STR, data);
} else if (timeout_ms == 0) {
- rv = net_mod_socket_sendto_nowait(gNetmod_socket, topics_buf, len, val);
+ rv = net_mod_socket_sendto_nowait(gNetmod_socket, topics_buf, len, val, SVR_STR, data);
} else {
- rv = net_mod_socket_sendto(gNetmod_socket, topics_buf, len, val);
+ rv = net_mod_socket_sendto(gNetmod_socket, topics_buf, len, val, SVR_STR, data);
}
free(topics_buf);
@@ -1377,6 +1385,7 @@
int size;
int val;
int min, len;
+ int data;
net_node_t node;
int node_size;
int recv_arr_size;
@@ -1469,6 +1478,7 @@
len += strlen(_input1.data);
#endif
+ data = net_mod_socket_svr_get(gNetmod_socket);
topics_buf = (char *)malloc(len);
if (topics_buf == NULL) {
@@ -1620,6 +1630,7 @@
int key;
int size;
int len;
+ int data;
int sec, nsec;
char buf_temp[MAX_STR_LEN] = { 0x00 };
char *topics_buf = NULL;
@@ -1642,20 +1653,21 @@
return false;
}
+ data = net_mod_socket_svr_get(gNetmod_socket);
if (timeout_ms > 0) {
sec = timeout_ms / 1000;
nsec = (timeout_ms - sec * 1000) * 1000 * 1000;
- rv = net_mod_socket_recvfrom_timeout(gNetmod_socket, &buf, &size, &key, sec, nsec);
+ rv = net_mod_socket_recvfrom_timeout(gNetmod_socket, &buf, &size, &key, sec, nsec, SVR_STR, data);
} else if (timeout_ms == 0) {
- rv = net_mod_socket_recvfrom_nowait(gNetmod_socket, &buf, &size, &key);
+ rv = net_mod_socket_recvfrom_nowait(gNetmod_socket, &buf, &size, &key, SVR_STR, data);
} else {
- rv = net_mod_socket_recvfrom(gNetmod_socket, &buf, &size, &key);
+ rv = net_mod_socket_recvfrom(gNetmod_socket, &buf, &size, &key, SVR_STR, data);
}
if (rv == 0) {
@@ -1735,6 +1747,7 @@
int BHSendReply(void *src, const void *reply, const int reply_len)
{
int rv;
+ int data;
const char *_input;
#if defined(PRO_DE_SERIALIZE)
@@ -1777,7 +1790,8 @@
rv = pthread_mutex_trylock(&mutex);
if (rv == 0) {
- rv = net_mod_socket_sendto(gNetmod_socket, _input, strlen(_input), *(int *)src);
+ data = net_mod_socket_svr_get(gNetmod_socket);
+ rv = net_mod_socket_sendto(gNetmod_socket, _input, strlen(_input), *(int *)src, SVR_STR, data);
memset(errString, 0x00, sizeof(errString));
strncpy(errString, bus_strerror(rv), sizeof(errString));
--
Gitblit v1.8.0