From 1fbfef2a51db4a3bac9d8a5b87af94a40a913b7a Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期日, 25 四月 2021 15:33:40 +0800
Subject: [PATCH] change mqid from uuid to uint64.
---
src/socket.h | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/socket.h b/src/socket.h
index 1ba10cb..cd6bfee 100644
--- a/src/socket.h
+++ b/src/socket.h
@@ -33,44 +33,37 @@
#include <vector>
using namespace bhome_msg;
-
class ShmSocket : private boost::noncopyable
{
- template <class... T>
- bool SendImpl(const void *valid_remote, T &&...rest)
- {
- send_buffer_.Append(*static_cast<const MQId *>(valid_remote), std::forward<decltype(rest)>(rest)...);
- return true;
- }
protected:
typedef bhome_shm::ShmMsgQueue Queue;
public:
+ typedef ShmMsgQueue::MQId MQId;
typedef bhome_shm::SharedMemory Shm;
typedef std::function<void(ShmSocket &sock, MsgI &imsg, BHMsgHead &head)> RecvCB;
typedef std::function<bool(ShmSocket &sock, MsgI &imsg, BHMsgHead &head)> PartialRecvCB;
typedef std::function<void(ShmSocket &sock)> IdleCB;
- ShmSocket(Shm &shm, const MQId &id, const int len);
+ ShmSocket(Shm &shm, const MQId id, const int len);
ShmSocket(Shm &shm, const int len = 12);
~ShmSocket();
- static bool Remove(SharedMemory &shm, const MQId &id) { return Queue::Remove(shm, id); }
+ 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(); }
+ MQId id() const { return mq().Id(); }
// 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); }
bool Start(const RecvCB &onData, int nworker = 1) { return Start(nworker, onData); }
bool Stop();
- size_t Pending() const { return mq().Pending(); }
template <class Body>
- bool Send(const void *valid_remote, BHMsgHead &head, Body &body, RecvCB &&cb = RecvCB())
+ bool Send(const MQId remote, BHMsgHead &head, Body &body, RecvCB &&cb = RecvCB())
{
try {
if (!cb) {
- return SendImpl(valid_remote, MsgI::Serialize(head, body));
+ return SendImpl(remote, MsgI::Serialize(head, body));
} else {
std::string msg_id(head.msg_id());
per_msg_cbs_->Store(msg_id, std::move(cb));
@@ -78,7 +71,7 @@
RecvCB cb_no_use;
per_msg_cbs_->Pick(msg_id, cb_no_use);
};
- return SendImpl(valid_remote, MsgI::Serialize(head, body), onExpireRemoveCB);
+ return SendImpl(remote, MsgI::Serialize(head, body), onExpireRemoveCB);
}
} catch (...) {
SetLastError(eError, "Send internal error.");
@@ -86,15 +79,15 @@
}
}
- bool Send(const void *valid_remote, const MsgI &imsg)
+ bool Send(const MQId remote, const MsgI &imsg)
{
- return SendImpl(valid_remote, imsg);
+ return SendImpl(remote, imsg);
}
bool SyncRecv(MsgI &msg, bhome_msg::BHMsgHead &head, const int timeout_ms);
template <class Body>
- bool SendAndRecv(const void *remote, BHMsgHead &head, Body &body, MsgI &reply, BHMsgHead &reply_head, const int timeout_ms)
+ bool SendAndRecv(const MQId remote, BHMsgHead &head, Body &body, MsgI &reply, BHMsgHead &reply_head, const int timeout_ms)
{
struct State {
std::mutex mutex;
@@ -144,6 +137,13 @@
bool StopNoLock();
bool RunningNoLock() { return !workers_.empty(); }
+ template <class... Rest>
+ bool SendImpl(const MQId remote, Rest &&...rest)
+ {
+ send_buffer_.Append(remote, std::forward<decltype(rest)>(rest)...);
+ return true;
+ }
+
std::vector<std::thread> workers_;
std::mutex mutex_;
std::atomic<bool> run_;
--
Gitblit v1.8.0