From 0f53806de20f07b0bc15877c7a9b293758acbfa7 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期三, 01 三月 2023 09:20:38 +0800
Subject: [PATCH] bug fixed ps_sub thread join
---
src/nng_wrap.cpp | 51 +++++++++++++++++++++++++++------------------------
1 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/src/nng_wrap.cpp b/src/nng_wrap.cpp
index 7b5559e..53a192a 100644
--- a/src/nng_wrap.cpp
+++ b/src/nng_wrap.cpp
@@ -56,9 +56,7 @@
// simple interface
void free_nng(void* data, const int data_len){
- if (data){
- free(data);
- }
+ free(data);
}
void copy_memory(void** dest, int *dest_len, const void* src, const int src_len){
@@ -70,7 +68,7 @@
}
void set_last_error(const std::string& emsg){
- verbose_info += emsg;
+ // verbose_info += emsg;
}
void get_last_error(int* ec, void** emsg, int* emsg_len){
@@ -79,10 +77,12 @@
*ec = nn_errno();
const char* msg = nn_strerror(*ec);
- string strMsg(msg);
- strMsg = strMsg + "{" + verbose_info + "}";
- copy_memory(emsg, emsg_len, strMsg.data(), strMsg.size());
- verbose_info.clear();
+ // string strMsg(msg);
+ // strMsg = strMsg + "{" + verbose_info + "}";
+ // copy_memory(emsg, emsg_len, strMsg.data(), strMsg.size());
+ // verbose_info.clear();
+
+ copy_memory(emsg, emsg_len, msg, strlen(msg));
}
///////////////////////////////////////////////////////
@@ -205,16 +205,17 @@
PRNTVITAG("client_socket faild\n");
return -1;
}
- // set_socket_timeout(sock, timeout_req_rep);
+ set_socket_timeout(sock, 300);
sub->socket_ = sock;
sub->t_ = get_thread([](const auto sub){
while (!sub->t_quit_.load()) {
- char* m;
- int m_len = nn_recv(sub->socket_, &m, NN_MSG, NN_DONTWAIT);
+ char* m{};
+ // int m_len = nn_recv(sub->socket_, &m, NN_MSG, NN_DONTWAIT);
+ int m_len = nn_recv(sub->socket_, &m, NN_MSG, 0);
if (m_len > 0){
string tmp_msg{m, (size_t)m_len};
nn_freemsg(m);
- const auto topic{tmp_msg.c_str()};
+ string topic{tmp_msg.c_str()};
string msg{};
{
lock_guard<mutex> l{sub->operator()()};
@@ -228,7 +229,7 @@
// printf("======>> subscribe recv topic %s msg length %lu\n", topic, msg.length());
if (!msg.empty()){
lock_guard<mutex> l(sub->mtx_msg_);
- sub->msg_.emplace_back(topic, move(msg));
+ sub->msg_.emplace_back(move(topic), move(msg));
sub->cv_msg_.notify_all();
}
@@ -309,9 +310,9 @@
PRNTVITAG("subscribe_read timeout");
return -1;
}
- const auto& tmp = sub->msg_.front();
- *topic = tmp.topic_;
- *msg = tmp.data_;
+ auto& tmp = sub->msg_.front();
+ *topic = std::move(tmp.topic_);
+ *msg = std::move(tmp.data_);
sub->msg_.pop_front();
return 0;
@@ -427,15 +428,14 @@
_rr* rep = (_rr*)w->user_data;
- string msg{(const char*)nng_msg_body(om), nng_msg_len(om)};
- nng_msg_free(om);
-
auto t = (*rep)();
lock_guard<mutex> l{rep->mtx_msg_};
rep->works_.emplace(get<0>(t), w);
- get<1>(t).emplace(get<0>(t), move(msg));
+ get<1>(t).emplace(get<0>(t), string{(const char*)nng_msg_body(om), nng_msg_len(om)});
get<0>(t)++;
rep->cv_msg_.notify_all();
+
+ nng_msg_free(om);
}
static struct work *alloc_work(nng_socket sock, _rr* rep, const int mode)
@@ -590,19 +590,22 @@
if (!w) return -1;
- *src = malloc(sizeof(uint64_t));
- *(uint64_t*)(*src) = key;
+ *src = malloc(sizeof(key));
+ memcpy(*src, &key, sizeof(key));
return w->mode;
}
-int send_reply(const void* src, const void* msg, const int msg_len, void* arg/*=NULL*/){
+int send_reply(void* src, const void* msg, const int msg_len, void* arg/*=NULL*/){
_rr* rep = (_rr*)arg;
if (!rep) rep = singleton<_rr>();
struct work* w{};
{
- auto key = *(static_cast<uint64_t*>(const_cast<void*>(src)));
+ uint64_t key;
+ memcpy(&key, src, sizeof(key));
+ // auto key = *(static_cast<uint64_t*>(const_cast<void*>(src)));
+ free(src);
lock_guard<mutex> l{rep->mtx_msg_};
auto iter = rep->works_.find(key);
--
Gitblit v1.8.0