From 58d904a328c0d849769b483e901a0be9426b8209 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 20 七月 2021 20:20:44 +0800
Subject: [PATCH] 调整Request C.BHFree的位置
---
src/defs.h | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/defs.h b/src/defs.h
index 51040e6..ec41371 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -23,6 +23,7 @@
#include <atomic>
#include <string>
+class ShmSocket;
typedef uint64_t MQId;
int64_t CalcAllocIndex(int64_t size);
@@ -38,9 +39,6 @@
MQInfo mq_bus_;
MQInfo mq_sender_;
robust::AtomicReqRep init_rr_;
- std::atomic<MQId> mqid_;
- CenterInfo() :
- mqid_(100000) {}
};
const int kBHCenterPort = 24287;
@@ -50,23 +48,28 @@
class SharedMemory;
} // namespace bhome_shm
+using bhome_shm::SharedMemory;
+
std::string BHomeShmName();
-bhome_shm::SharedMemory &BHomeShm();
-CenterInfo *GetCenterInfo(bhome_shm::SharedMemory &shm);
-bool CenterInit(bhome_shm::SharedMemory &shm);
-bool GlobalInit(bhome_shm::SharedMemory &shm);
+SharedMemory &BHomeShm();
+CenterInfo *GetCenterInfo(SharedMemory &shm);
+ShmSocket &DefaultSender(SharedMemory &shm);
+
+MQId NewSession();
+bool CenterInit();
+bool GlobalInit(SharedMemory &shm);
typedef std::string Topic;
void SetLastError(const int ec, const std::string &msg);
void GetLastError(int &ec, std::string &msg);
-//TODO center can check shm for previous crash.
-const MQInfo &BHGlobalSenderAddress();
-const MQInfo &BHTopicCenterAddress();
-const MQInfo &BHTopicBusAddress();
-bool BHNodeInit(const int64_t request, int64_t &reply);
-void BHCenterHandleInit(std::function<int64_t(const int64_t)> const &onReq);
+const MQInfo &BHTopicCenterAddress(SharedMemory &shm);
+const MQInfo &BHTopicBusAddress(SharedMemory &shm);
+bool BHNodeInit(SharedMemory &shm, const int64_t request, int64_t &reply);
+void BHCenterHandleInit(SharedMemory &shm, std::function<int64_t(const int64_t)> const &onReq);
// node mq is avail with in timeout; after that may get killed.
int NodeTimeoutSec();
+std::string BHLogDir();
+
#endif // end of include guard: DEFS_KP8LKGD0
--
Gitblit v1.8.0