From 4deeafbd502dc3c57dab8ad6ca601a38a9e7f074 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期二, 06 四月 2021 19:10:49 +0800
Subject: [PATCH] add uni center.
---
src/pubsub.cpp | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/pubsub.cpp b/src/pubsub.cpp
index cfc77ab..90688ec 100644
--- a/src/pubsub.cpp
+++ b/src/pubsub.cpp
@@ -22,7 +22,7 @@
using namespace std::chrono_literals;
using namespace bhome_msg;
-bool SocketPublish::Publish(const std::string &topic, const void *data, const size_t size, const int timeout_ms)
+bool SocketPublish::Publish(const Topic &topic, const void *data, const size_t size, const int timeout_ms)
{
try {
MsgI imsg;
@@ -30,16 +30,16 @@
return false;
}
DEFER1(imsg.Release(shm()));
- return ShmMsgQueue::Send(shm(), kBHBusQueueId, imsg, timeout_ms);
+ return ShmMsgQueue::Send(shm(), kBHTopicBus, imsg, timeout_ms);
} catch (...) {
return false;
}
}
-bool SocketSubscribe::Subscribe(const std::vector<std::string> &topics, const int timeout_ms)
+bool SocketSubscribe::Subscribe(const std::vector<Topic> &topics, const int timeout_ms)
{
try {
- return mq().Send(kBHBusQueueId, MakeSub(mq().Id(), topics), timeout_ms);
+ return mq().Send(kBHTopicBus, MakeSub(mq().Id(), topics), timeout_ms);
} catch (...) {
return false;
}
@@ -49,7 +49,7 @@
{
auto AsyncRecvProc = [this, tdcb](BHMsg &msg) {
if (msg.type() == kMsgTypePublish) {
- DataPub d;
+ MsgPub d;
if (d.ParseFromString(msg.body())) {
tdcb(d.topic(), d.data());
}
@@ -61,11 +61,11 @@
return tdcb && Start(AsyncRecvProc, nworker);
}
-bool SocketSubscribe::RecvSub(std::string &topic, std::string &data, const int timeout_ms)
+bool SocketSubscribe::RecvSub(Topic &topic, std::string &data, const int timeout_ms)
{
BHMsg msg;
if (SyncRecv(msg, timeout_ms) && msg.type() == kMsgTypePublish) {
- DataPub d;
+ MsgPub d;
if (d.ParseFromString(msg.body())) {
d.mutable_topic()->swap(topic);
d.mutable_data()->swap(data);
--
Gitblit v1.8.0