From c479ef57baaaa28964fc3ec8d80ff99dffa7d49f Mon Sep 17 00:00:00 2001
From: fujuntang <fujuntang@smartai.com>
Date: 星期三, 10 十一月 2021 09:49:29 +0800
Subject: [PATCH] Fix the system hang issue when the app is killed contantly.
---
src/bh_api.cpp | 147 ++++++++++++++++++++++++++++++-------------------
1 files changed, 90 insertions(+), 57 deletions(-)
diff --git a/src/bh_api.cpp b/src/bh_api.cpp
index 8b03231..c74c80d 100644
--- a/src/bh_api.cpp
+++ b/src/bh_api.cpp
@@ -18,11 +18,11 @@
static int gRun_stat = 0;
static void *gNetmod_socket = NULL;
-static std::map<std::string, int> gRecvbuf;
static pthread_mutex_t mutex;
static pthread_t gTids;
+
static void *client_run_check(void *skptr) {
pthread_detach(pthread_self());
@@ -37,7 +37,7 @@
sec = TIME_WAIT;
nsec = 0;
- sprintf(buf, "%s", "Success");
+ sprintf(buf, "%s", STR_EXEC);
data = net_mod_socket_int_get(gNetmod_socket);
while(true) {
@@ -46,9 +46,13 @@
BHFree(buf_temp, size);
- rv = net_mod_socket_sendto_timeout(gNetmod_socket, buf, strlen(buf), key, sec, nsec, SVR_STR, data);
- if (rv != 0) {
- logger->error("the process check response failed with error: %s!\n", bus_strerror(rv));
+ if ((gNetmod_socket != NULL) && (gRun_stat != 0)) {
+ rv = net_mod_socket_sendto_timeout(gNetmod_socket, buf, strlen(buf), key, sec, nsec, SVR_STR, data);
+ if (rv != 0) {
+ logger->error("the process check response failed with error: %s!\n", bus_strerror(rv));
+ }
+ } else {
+ break;
}
} else {
@@ -124,25 +128,25 @@
shm_mm_wrapper_init(SHM_RES_SIZE);
#if defined(PRO_DE_SERIALIZE)
- if (_input.proc_id != NULL) {
+ if (strlen(_input.proc_id) > 0) {
count = strlen(_input.proc_id) + 1;
min = count > (MAX_STR_LEN - 1) ? (MAX_STR_LEN - 1) : count;
strncpy(pData.proc_id, _input.proc_id, min);
}
- if (_input.name != NULL) {
+ if (strlen(_input.name) > 0) {
count = strlen(_input.name) + 1;
min = count > (MAX_STR_LEN - 1)? (MAX_STR_LEN -1) : count;
strncpy(pData.name, _input.name, min);
}
- if (_input.public_info != NULL) {
+ if (strlen(_input.public_info) > 0) {
count = strlen(_input.public_info) + 1;
min = count > (MAX_STR_LEN - 1)? (MAX_STR_LEN - 1) : count;
strncpy(pData.public_info, _input.public_info, min);
}
- if (_input.private_info != NULL) {
+ if (strlen(_input.private_info) > 0) {
count = strlen(_input.private_info) + 1;
min = count > (MAX_STR_LEN - 1)? (MAX_STR_LEN - 1): count;
strncpy(pData.private_info, _input.private_info, min);
@@ -173,11 +177,12 @@
}
#endif
- if (pData.proc_id == NULL) {
+ if (strlen(pData.proc_id) == 0) {
rv = EBUS_INVALID_PARA;
bus_errorset(rv);
+ gRun_stat = 0;
pthread_mutex_unlock(&mutex);
goto exit_entry;
@@ -186,13 +191,13 @@
gNetmod_socket = net_mod_socket_open();
hashtable_t *hashtable = mm_get_hashtable();
key = hashtable_alloc_key(hashtable);
+ net_mod_socket_bind(gNetmod_socket, key);
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);
@@ -540,21 +545,28 @@
if (rv == 0) {
- ptr = (ProcInfo_query *)((char *)buf + sizeof(int));
- mtr_list_num = ptr->num;
+ min = *(int *)buf;
+ if (min > 0) {
+ ptr = (ProcInfo_query *)((char *)buf + sizeof(int));
+ mtr_list_num = ptr->num;
+
+ if (mtr_list_num > sizeof(mtr_list) / sizeof(mtr_list[0])) {
+ mtr_list_num = sizeof(mtr_list) / sizeof(mtr_list[0]);
+ }
- if (mtr_list_num > sizeof(mtr_list) / sizeof(mtr_list[0])) {
- mtr_list_num = sizeof(mtr_list) / sizeof(mtr_list[0]);
+ Proc_ptr = &(ptr->procData);
+ for(int i = 0; i < mtr_list_num; i++) {
+ mtr_list[i].proc_id = (Proc_ptr + i)->proc_id;
+ mtr_list[i].mq_id = ID_RSV;
+ mtr_list[i].abs_addr = ABS_ID_RSV;
+ mtr_list[i].ip = "127.0.0.1";
+ mtr_list[i].port = 5000;
+ }
+ } else {
+ mtr_list_num = 0;
}
-
- Proc_ptr = &(ptr->procData);
- for(int i = 0; i < mtr_list_num; i++) {
- mtr_list[i].proc_id = (Proc_ptr + i)->proc_id;
- mtr_list[i].mq_id = ID_RSV;
- mtr_list[i].abs_addr = ABS_ID_RSV;
- mtr_list[i].ip = "127.0.0.1";
- mtr_list[i].port = 5000;
- }
+
+ free(buf);
}
exit_entry:
@@ -685,27 +697,31 @@
if (mpr_list_num > (sizeof(mpr_list) / sizeof(mpr_list[0]))) {
mpr_list_num = sizeof(mpr_list) / sizeof(mpr_list[0]);
}
-
- Proc_ptr = (ProcInfo_sum *)((char *)buf + sizeof(int));
- for(int i = 0; i < mpr_list_num; i++) {
- mpr_list[i].proc_id = (Proc_ptr + i)->procData.proc_id;
- mpr_list[i].name = (Proc_ptr + i)->procData.name;
- mpr_list[i].public_info = (Proc_ptr + i)->procData.public_info;
- mpr_list[i].private_info = (Proc_ptr + i)->procData.private_info;
- mpr_list[i].online = (Proc_ptr + i)->stat;
- mpr_list[i].topic_list_num = (Proc_ptr + i)->list_num;
-
- for(int j = 0; j < mpr_list[i].topic_list_num; j++)
- {
- if (j == 0) {
- mpr_list[i].topic_list[j] = (Proc_ptr + i)->reg_info;
- } else if (j == 1) {
- mpr_list[i].topic_list[j] = (Proc_ptr + i)->local_info;
- } else if (j == 2) {
- mpr_list[i].topic_list[j] = (Proc_ptr + i)->net_info;
+
+ if (mpr_list_num > 0) {
+ Proc_ptr = (ProcInfo_sum *)((char *)buf + sizeof(int));
+ for(int i = 0; i < mpr_list_num; i++) {
+ mpr_list[i].proc_id = (Proc_ptr + i)->procData.proc_id;
+ mpr_list[i].name = (Proc_ptr + i)->procData.name;
+ mpr_list[i].public_info = (Proc_ptr + i)->procData.public_info;
+ mpr_list[i].private_info = (Proc_ptr + i)->procData.private_info;
+ mpr_list[i].online = (Proc_ptr + i)->stat;
+ mpr_list[i].topic_list_num = (Proc_ptr + i)->list_num;
+
+ for(int j = 0; j < mpr_list[i].topic_list_num; j++)
+ {
+ if (j == 0) {
+ mpr_list[i].topic_list[j] = (Proc_ptr + i)->reg_info;
+ } else if (j == 1) {
+ mpr_list[i].topic_list[j] = (Proc_ptr + i)->local_info;
+ } else if (j == 2) {
+ mpr_list[i].topic_list[j] = (Proc_ptr + i)->net_info;
+ }
}
}
}
+
+ free(buf);
}
errString = bus_strerror(0, 1);
@@ -867,8 +883,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);
#else
len = strlen(errString) + 1;
@@ -1202,7 +1218,6 @@
std::string str;
std::string MsgID;
int timeout_ms = 3000;
- std::map<std::string, int>::iterator recvIter;
char data_buf[MAX_STR_LEN] = { 0x00 };
char buf_temp[MAX_STR_LEN] = { 0x00 };
char *topics_buf = NULL;
@@ -1265,11 +1280,10 @@
#endif
str = buf_temp;
- recvIter = gRecvbuf.find(str);
- if(recvIter != gRecvbuf.end()) {
+ val = net_mod_socket_buf_data_get(gNetmod_socket, str);
+ if(val > 0) {
rv = 0;
- val = recvIter->second;
} else {
rv = net_mod_socket_reg(gNetmod_socket, buf_temp, strlen(buf_temp), &buf, &size, timeout_ms, PROC_QUE_STCS);
@@ -1280,7 +1294,7 @@
val = atoi((char *)data_buf);
if (val > 0) {
str = buf_temp;
- gRecvbuf.insert({str, val});
+ net_mod_socket_buf_data_set(gNetmod_socket, str, val);
}
free(buf);
@@ -1381,7 +1395,6 @@
net_mod_err_t *errarr;
int errarr_size = 0;
char *errString = NULL;
- std::map<std::string, int>::iterator recvIter;
char buf_temp[MAX_STR_LEN] = { 0x00 };
char *topics_buf = NULL;
@@ -1450,11 +1463,10 @@
#endif
str = buf_temp;
- recvIter = gRecvbuf.find(str);
- if(recvIter != gRecvbuf.end()) {
+ val = net_mod_socket_buf_data_get(gNetmod_socket, str);
+ if(val > 0) {
rv = 0;
- val = recvIter->second;
} else {
rv = net_mod_socket_reg(gNetmod_socket, buf_temp, strlen(buf_temp), &buf, &size, timeout_ms, PROC_QUE_STCS);
@@ -1465,7 +1477,7 @@
val = atoi((char *)data_buf);
if (val > 0) {
str = buf_temp;
- gRecvbuf.insert({str, val});
+ net_mod_socket_buf_data_set(gNetmod_socket, str, val);
}
free(buf);
@@ -1587,6 +1599,13 @@
exit_entry:
errString = bus_strerror(0, 1);
+
+ if (rv != 0) {
+ if ((proc_id != NULL) && (proc_id_len != NULL)) {
+ *proc_id_len = 0;
+ *proc_id = NULL;
+ }
+ }
#if defined(PRO_DE_SERIALIZE)
::bhome_msg::MsgRequestTopicReply mrt;
@@ -1712,6 +1731,12 @@
if (rv != 0) {
rrr.topic = STR_RSV;
rrr.data = STR_RSV;
+
+ if ((proc_id != NULL) && (proc_id_len != NULL)) {
+
+ *proc_id_len = 0;
+ *proc_id = NULL;
+ }
}
#if defined(PRO_DE_SERIALIZE)
@@ -1819,13 +1844,21 @@
}
-#if defined(MSG_HANDLER)
int inter_key_get(void)
{
if (gNetmod_socket != NULL)
return net_mod_socket_get_key(gNetmod_socket);
- return 0;
+ return SHM_BUS_KEY;
}
-#endif
+
+void *socket_data_get(void)
+{
+ return gNetmod_socket;
+}
+
+void inter_key_set(int key)
+{
+ net_mod_socket_bind(gNetmod_socket, key);
+}
--
Gitblit v1.8.0