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/sendq.h | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/sendq.h b/src/sendq.h
index bba44af..0699df7 100644
--- a/src/sendq.h
+++ b/src/sendq.h
@@ -37,7 +37,7 @@
class SendQ
{
public:
- typedef std::string Remote;
+ typedef MQId Remote;
typedef bhome_msg::MsgI MsgI;
typedef std::string Content;
typedef boost::variant2::variant<MsgI, Content> Data;
@@ -50,18 +50,18 @@
typedef TimedMsg::TimePoint TimePoint;
typedef TimedMsg::Duration Duration;
- template <class... Rest>
- void Append(const MQId &id, Rest &&...rest)
- {
- Append(std::string((const char *) &id, sizeof(id)), std::forward<decltype(rest)>(rest)...);
- }
+ // template <class... Rest>
+ // void Append(const MQId &id, Rest &&...rest)
+ // {
+ // Append(std::string((const char *) &id, sizeof(id)), std::forward<decltype(rest)>(rest)...);
+ // }
- void Append(const Remote &addr, const MsgI &msg, OnMsgEvent onExpire = OnMsgEvent())
+ void Append(const Remote addr, const MsgI msg, OnMsgEvent onExpire = OnMsgEvent())
{
msg.AddRef();
AppendData(addr, Data(msg), DefaultExpire(), onExpire);
}
- void Append(const Remote &addr, Content &&content, OnMsgEvent onExpire = OnMsgEvent())
+ void Append(const Remote addr, Content &&content, OnMsgEvent onExpire = OnMsgEvent())
{
AppendData(addr, Data(std::move(content)), DefaultExpire(), onExpire);
}
@@ -71,7 +71,7 @@
private:
static TimePoint Now() { return TimedMsg::Clock::now(); }
static TimePoint DefaultExpire() { return Now() + std::chrono::seconds(60); }
- void AppendData(const Remote &addr, Data &&data, const TimePoint &expire, OnMsgEvent onExpire)
+ void AppendData(const Remote addr, Data &&data, const TimePoint &expire, OnMsgEvent onExpire)
{
//TODO simple queue, organize later ?
@@ -88,8 +88,8 @@
typedef std::list<Array> ArrayList;
typedef std::unordered_map<Remote, ArrayList> Store;
- int DoSend1Remote(bhome_shm::ShmMsgQueue &mq, const Remote &remote, Array &arr);
- int DoSend1Remote(bhome_shm::ShmMsgQueue &mq, const Remote &remote, ArrayList &arr);
+ int DoSend1Remote(bhome_shm::ShmMsgQueue &mq, const Remote remote, Array &arr);
+ int DoSend1Remote(bhome_shm::ShmMsgQueue &mq, const Remote remote, ArrayList &arr);
std::mutex mutex_in_;
std::mutex mutex_out_;
--
Gitblit v1.8.0