From 708ff9e8af731e2799767ed8bfca7df3b74fc26a Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 16 四月 2021 19:20:21 +0800
Subject: [PATCH] sendq use less shm, copy data.
---
src/socket.h | 66 ++++++++++++++++++---------------
1 files changed, 36 insertions(+), 30 deletions(-)
diff --git a/src/socket.h b/src/socket.h
index 5973ab6..db64b36 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,11 @@
class ShmSocket : private boost::noncopyable
{
- template <class DoSend>
- inline bool SendImpl(MsgI &msg, const int timeout_ms, const DoSend &doSend)
+ template <class... T>
+ bool SendImpl(const void *valid_remote, T &&...rest)
{
- bool r = false;
- DEFER1(if (msg.IsCounted() || !r) { msg.Release(shm()); });
- r = doSend(msg);
- return r;
+ send_buffer_.Append(*static_cast<const MQId *>(valid_remote), std::forward<decltype(rest)>(rest)...);
+ return true;
}
protected:
@@ -57,8 +56,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 +65,33 @@
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);
+ try {
+ if (!cb) {
+ return SendImpl(valid_remote, MsgI::Serialize(head, body));
+ } else {
+ std::string msg_id(head.msg_id());
+ per_msg_cbs_->Add(msg_id, cb);
+ auto onExpireRemoveCB = [this, msg_id](SendQ::Data const &msg) {
+ RecvCB cb_no_use;
+ per_msg_cbs_->Find(msg_id, cb_no_use);
+ };
+ return SendImpl(valid_remote, MsgI::Serialize(head, body), onExpireRemoveCB);
+ }
+ } catch (...) {
+ SetLastError(eError, "Send internal error.");
+ 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, [&]() { per_msg_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)
@@ -114,7 +117,7 @@
};
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");
}
@@ -129,8 +132,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_; }
@@ -139,7 +143,6 @@
bool StopNoLock();
bool RunningNoLock() { return !workers_.empty(); }
- Shm &shm_;
std::vector<std::thread> workers_;
std::mutex mutex_;
std::atomic<bool> run_;
@@ -150,6 +153,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)
{
@@ -165,6 +169,8 @@
};
Synced<AsyncCBs> per_msg_cbs_;
+ SendQ send_buffer_;
+ // Synced<SendQ> send_buffer_;
};
#endif // end of include guard: SOCKET_GWTJHBPO
--
Gitblit v1.8.0