From 70fec55c71f707358e6dba1b551d7836e93a5c78 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期二, 06 四月 2021 19:30:50 +0800
Subject: [PATCH] refactor.
---
src/topic_reply.cpp | 4 ++--
src/pubsub_center.h | 2 +-
src/reqrep_center.h | 2 +-
src/defs.h | 6 +++---
src/pubsub.cpp | 4 ++--
src/topic_request.cpp | 2 +-
src/center.cpp | 2 +-
src/defs.cpp | 30 ++++++++++++++++++++++++++++++
8 files changed, 41 insertions(+), 11 deletions(-)
diff --git a/src/center.cpp b/src/center.cpp
index 9a2fc8f..d0e61a2 100644
--- a/src/center.cpp
+++ b/src/center.cpp
@@ -38,7 +38,7 @@
}
BHCenter::BHCenter(Socket::Shm &shm) :
- socket_(shm, &kBHUniCenter, 1000) {}
+ socket_(shm, &BHUniCenter(), 1000) {}
BHCenter::BHCenter() :
BHCenter(BHomeShm()) {}
diff --git a/src/defs.cpp b/src/defs.cpp
new file mode 100644
index 0000000..4051196
--- /dev/null
+++ b/src/defs.cpp
@@ -0,0 +1,30 @@
+/*
+ * =====================================================================================
+ *
+ * Filename: defs.cpp
+ *
+ * Description:
+ *
+ * Version: 1.0
+ * Created: 2021骞�04鏈�06鏃� 19鏃�23鍒�14绉�
+ * Revision: none
+ * Compiler: gcc
+ *
+ * Author: Li Chao (),
+ * Organization:
+ *
+ * =====================================================================================
+ */
+#include "defs.h"
+namespace
+{
+
+const MQId kBHTopicBus = boost::uuids::string_generator()("01234567-89ab-cdef-8349-1234567890ff");
+const MQId kBHTopicReqRepCenter = boost::uuids::string_generator()("12345670-89ab-cdef-8349-1234567890ff");
+const MQId kBHUniCenter = boost::uuids::string_generator()("87654321-89ab-cdef-8349-1234567890ff");
+
+} // namespace
+
+const MQId &BHTopicBus() { return kBHTopicBus; }
+const MQId &BHTopicReqRepCenter() { return kBHTopicReqRepCenter; }
+const MQId &BHUniCenter() { return kBHUniCenter; }
diff --git a/src/defs.h b/src/defs.h
index 8d5f468..91d8cf3 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -25,9 +25,9 @@
typedef boost::uuids::uuid MQId;
-const MQId kBHTopicBus = boost::uuids::string_generator()("01234567-89ab-cdef-8349-1234567890ff");
-const MQId kBHTopicReqRepCenter = boost::uuids::string_generator()("12345670-89ab-cdef-8349-1234567890ff");
-const MQId kBHUniCenter = boost::uuids::string_generator()("87654321-89ab-cdef-8349-1234567890ff");
+const MQId &BHTopicBus();
+const MQId &BHTopicReqRepCenter();
+const MQId &BHUniCenter();
const int kBHCenterPort = 24287;
const char kTopicSep = '.';
diff --git a/src/pubsub.cpp b/src/pubsub.cpp
index 90688ec..520c006 100644
--- a/src/pubsub.cpp
+++ b/src/pubsub.cpp
@@ -30,7 +30,7 @@
return false;
}
DEFER1(imsg.Release(shm()));
- return ShmMsgQueue::Send(shm(), kBHTopicBus, imsg, timeout_ms);
+ return ShmMsgQueue::Send(shm(), BHTopicBus(), imsg, timeout_ms);
} catch (...) {
return false;
}
@@ -39,7 +39,7 @@
bool SocketSubscribe::Subscribe(const std::vector<Topic> &topics, const int timeout_ms)
{
try {
- return mq().Send(kBHTopicBus, MakeSub(mq().Id(), topics), timeout_ms);
+ return mq().Send(BHTopicBus(), MakeSub(mq().Id(), topics), timeout_ms);
} catch (...) {
return false;
}
diff --git a/src/pubsub_center.h b/src/pubsub_center.h
index e79dd96..0b00c41 100644
--- a/src/pubsub_center.h
+++ b/src/pubsub_center.h
@@ -34,7 +34,7 @@
public:
PubSubCenter(ShmSocket::Shm &shm) :
- socket_(shm, &kBHTopicBus, 1000) {}
+ socket_(shm, &BHTopicBus(), 1000) {}
PubSubCenter() :
PubSubCenter(BHomeShm()) {}
~PubSubCenter() { Stop(); }
diff --git a/src/reqrep_center.h b/src/reqrep_center.h
index 326ac7a..069ed11 100644
--- a/src/reqrep_center.h
+++ b/src/reqrep_center.h
@@ -29,7 +29,7 @@
public:
ReqRepCenter(ShmSocket::Shm &shm) :
- socket_(shm, &kBHTopicReqRepCenter, 1000) {}
+ socket_(shm, &BHTopicReqRepCenter(), 1000) {}
ReqRepCenter() :
ReqRepCenter(BHomeShm()) {}
~ReqRepCenter() { Stop(); }
diff --git a/src/topic_reply.cpp b/src/topic_reply.cpp
index 356cf3e..aaed407 100644
--- a/src/topic_reply.cpp
+++ b/src/topic_reply.cpp
@@ -70,11 +70,11 @@
bool SocketReply::Register(const ProcInfo &proc_info, const std::vector<std::string> &topics, const int timeout_ms)
{
//TODO check reply?
- return SyncSend(&kBHTopicReqRepCenter, MakeRegister(mq().Id(), proc_info, topics), timeout_ms);
+ return SyncSend(&BHTopicReqRepCenter(), MakeRegister(mq().Id(), proc_info, topics), timeout_ms);
}
bool SocketReply::Heartbeat(const ProcInfo &proc_info, const int timeout_ms)
{
- return SyncSend(&kBHTopicReqRepCenter, MakeHeartbeat(mq().Id(), proc_info), timeout_ms);
+ return SyncSend(&BHTopicReqRepCenter(), MakeHeartbeat(mq().Id(), proc_info), timeout_ms);
}
bool SocketReply::StartWorker(const OnRequest &rcb, int nworker)
{
diff --git a/src/topic_request.cpp b/src/topic_request.cpp
index ce7c1a8..322ed64 100644
--- a/src/topic_request.cpp
+++ b/src/topic_request.cpp
@@ -191,7 +191,7 @@
BHMsg result;
const BHMsg &msg = MakeQueryTopic(mq().Id(), topic);
- if (SyncSendAndRecv(&kBHTopicReqRepCenter, &msg, &result, timeout_ms)) {
+ if (SyncSendAndRecv(&BHTopicReqRepCenter(), &msg, &result, timeout_ms)) {
if (result.type() == kMsgTypeQueryTopicReply) {
MsgQueryTopicReply reply;
if (reply.ParseFromString(result.body())) {
--
Gitblit v1.8.0