From c6964d5af25d4ec7ed9dbe7674dc4e3896b36ead Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 16 四月 2021 16:10:02 +0800
Subject: [PATCH] node remove mq if never registered; refactor.
---
src/socket.h | 76 ++++++++++++++++++++++----------------
1 files changed, 44 insertions(+), 32 deletions(-)
diff --git a/src/socket.h b/src/socket.h
index ee25d81..dbb161c 100644
--- a/src/socket.h
+++ b/src/socket.h
@@ -21,6 +21,7 @@
#include "bh_util.h"
#include "defs.h"
+#include "sendq.h"
#include "shm_queue.h"
#include <atomic>
#include <boost/noncopyable.hpp>
@@ -35,13 +36,12 @@
class ShmSocket : private boost::noncopyable
{
- template <class DoSend>
- inline bool SendImpl(MsgI &msg, const int timeout_ms, const DoSend &doSend)
+ bool SendImpl(const void *valid_remote, MsgI const &imsg, SendQ::OnMsgEvent onExpire = SendQ::OnMsgEvent())
{
- bool r = false;
- DEFER1(if (msg.IsCounted() || !r) { msg.Release(shm()); });
- r = doSend(msg);
- return r;
+ // if (!mq().TrySend(*(MQId *) valid_remote, imsg)) {
+ send_buffer_.Append(*static_cast<const MQId *>(valid_remote), imsg, onExpire);
+ // }
+ return true;
}
protected:
@@ -57,8 +57,8 @@
ShmSocket(Shm &shm, const int len = 12);
~ShmSocket();
static bool Remove(SharedMemory &shm, const MQId &id) { return Queue::Remove(shm, id); }
+ bool Remove() { return Remove(shm(), id()); }
const MQId &id() const { return mq().Id(); }
- Shm &shm() { return shm_; }
// start recv.
bool Start(int nworker = 1, const RecvCB &onData = RecvCB(), const IdleCB &onIdle = IdleCB());
bool Start(const RecvCB &onData, const IdleCB &onIdle, int nworker = 1) { return Start(nworker, onData, onIdle); }
@@ -66,29 +66,35 @@
bool Stop();
size_t Pending() const { return mq().Pending(); }
- bool Send(const void *valid_remote, const MsgI &imsg, const int timeout_ms)
+ template <class Body>
+ bool Send(const void *valid_remote, const BHMsgHead &head, const Body &body, const RecvCB &cb = RecvCB())
{
- assert(valid_remote);
- return mq().Send(*static_cast<const MQId *>(valid_remote), imsg, timeout_ms);
+ MsgI msg;
+ if (msg.Make(shm(), head, body)) {
+ DEFER1(if (msg.IsCounted()) { msg.Release(shm()); });
+ std::string msg_id(head.msg_id());
+ if (!cb) {
+ return SendImpl(valid_remote, msg);
+ } else {
+ per_msg_cbs_->Add(msg_id, cb);
+ auto onExpireRemoveCB = [this, msg_id](MsgI const &msg) {
+ RecvCB cb_no_use;
+ per_msg_cbs_->Find(msg_id, cb_no_use);
+ };
+ return SendImpl(valid_remote, msg, onExpireRemoveCB);
+ }
+ } else {
+ SetLastError(ENOMEM, "Out of mem");
+ }
+ return false;
}
- //TODO reimplment, using async.
+
+ bool Send(const void *valid_remote, const MsgI &imsg)
+ {
+ return SendImpl(valid_remote, imsg);
+ }
+
bool SyncRecv(MsgI &msg, bhome::msg::BHMsgHead &head, const int timeout_ms);
-
- template <class Body>
- bool Send(const void *valid_remote, const BHMsgHead &head, const Body &body, const int timeout_ms, const RecvCB &cb)
- {
- auto DoSend = [&](MsgI &msg) { return mq().Send(*static_cast<const MQId *>(valid_remote), msg, timeout_ms, [&]() { async_cbs_->Add(head.msg_id(), cb); }); };
- MsgI msg;
- return msg.Make(shm(), head, body) && SendImpl(msg, timeout_ms, DoSend);
- }
-
- template <class Body>
- bool Send(const void *valid_remote, const BHMsgHead &head, const Body &body, const int timeout_ms)
- {
- auto DoSend = [&](MsgI &msg) { return mq().Send(*static_cast<const MQId *>(valid_remote), msg, timeout_ms); };
- MsgI msg;
- return msg.Make(shm(), head, body) && SendImpl(msg, timeout_ms, DoSend);
- }
template <class Body>
bool SendAndRecv(const void *remote, const BHMsgHead &head, const Body &body, MsgI &reply, BHMsgHead &reply_head, const int timeout_ms)
@@ -109,12 +115,15 @@
reply.swap(msg);
reply_head.Swap(&head);
st->cv.notify_one();
- } else {
+ } else { // ignore
}
};
std::unique_lock<std::mutex> lk(st->mutex);
- bool sendok = Send(remote, head, body, timeout_ms, OnRecv);
+ bool sendok = Send(remote, head, body, OnRecv);
+ if (!sendok) {
+ printf("send timeout\n");
+ }
if (sendok && st->cv.wait_until(lk, endtime) == std::cv_status::no_timeout) {
return true;
} else {
@@ -126,8 +135,9 @@
}
}
+ Shm &shm() const { return mq().shm(); }
+
protected:
- const Shm &shm() const { return shm_; }
Queue &mq() { return mq_; } // programmer should make sure that mq_ is valid.
const Queue &mq() const { return mq_; }
std::mutex &mutex() { return mutex_; }
@@ -136,7 +146,6 @@
bool StopNoLock();
bool RunningNoLock() { return !workers_.empty(); }
- Shm &shm_;
std::vector<std::thread> workers_;
std::mutex mutex_;
std::atomic<bool> run_;
@@ -147,6 +156,7 @@
std::unordered_map<std::string, RecvCB> store_;
public:
+ bool empty() const { return store_.empty(); }
bool Add(const std::string &id, const RecvCB &cb) { return store_.emplace(id, cb).second; }
bool Find(const std::string &id, RecvCB &cb)
{
@@ -161,7 +171,9 @@
}
};
- Synced<AsyncCBs> async_cbs_;
+ Synced<AsyncCBs> per_msg_cbs_;
+ SendQ send_buffer_;
+ // Synced<SendQ> send_buffer_;
};
#endif // end of include guard: SOCKET_GWTJHBPO
--
Gitblit v1.8.0