From b55ffe89f4b237be5f79232cfddfe22bfdb87c64 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期四, 01 四月 2021 13:23:48 +0800
Subject: [PATCH] make req/rep,sub/pub sockets sub class;
---
src/socket.h | 45 +++++++++++++++++----------------------------
1 files changed, 17 insertions(+), 28 deletions(-)
diff --git a/src/socket.h b/src/socket.h
index eee5b5b..20da7c0 100644
--- a/src/socket.h
+++ b/src/socket.h
@@ -26,59 +26,48 @@
#include <memory>
#include <mutex>
#include <thread>
-#include <unordered_map>
#include <vector>
class ShmSocket : private boost::noncopyable
{
+protected:
typedef bhome_shm::ShmMsgQueue Queue;
public:
- enum Type {
- eSockRequest,
- eSockReply,
- eSockSubscribe,
- eSockPublish,
- eSockBus,
- };
+ typedef bhome_shm::SharedMemory Shm;
typedef std::function<void(bhome_msg::BHMsg &msg)> RecvCB;
typedef std::function<void(bhome_msg::MsgI &imsg)> RecvRawCB;
- typedef std::function<void(const void *data, const size_t size)> RequestResultCB;
- ShmSocket(Type type, bhome_shm::SharedMemory &shm);
- ShmSocket(Type type);
+ ShmSocket(Shm &shm, const int len = 12);
~ShmSocket();
- bool RequestRPC(const std::string &topic, const void *data, const size_t size, const int timeout_ms, const RequestResultCB &rrcb);
- bool RequestRPC(const std::string &topic, const void *data, const size_t size, const int timeout_ms, std::string &out);
-
- // bool HandleRequest(onData);
- bool ReadRequest(); // exclude with HandleRequest
- bool SendReply(); // exclude with HandleRequest
-
- bool Publish(const std::string &topic, const void *data, const size_t size, const int timeout_ms);
- bool Subscribe(const std::vector<std::string> &topics, const int timeout_ms);
- bool RecvSub(std::string &topic, std::string &data, const int timeout_ms);
// start recv.
bool Start(const RecvCB &onData, int nworker = 1);
bool StartRaw(const RecvRawCB &onData, int nworker = 1);
- bool StartAsync(int nworker = 2);
bool Stop();
size_t Pending() const { return mq_ ? mq_->Pending() : 0; }
+protected:
+ ShmSocket(Shm &shm, const void *id, const int len);
+ Shm &shm() { return shm_; }
+ const Shm &shm() const { return shm_; }
+ Queue &mq() { return *mq_; } // programmer should make sure that mq_ is valid.
+ const Queue &mq() const { return *mq_; }
+ std::mutex &mutex() { return mutex_; }
+
+ bool SyncSend(const void *id, const bhome_msg::BHMsg &msg, const int timeout_ms);
+ bool SyncRecv(bhome_msg::BHMsg &msg, const int timeout_ms);
+
private:
- bool AsyncRequest(const void *remote, const void *msg, const int timeout_ms, const RecvCB &cb);
- bool SyncRequest(const void *remote, const void *msg, void *result, const int timeout_ms);
- bool QueryRPCTopic(const std::string &topic, bhome::msg::BHAddress &addr, const int timeout_ms);
bool StopNoLock();
- bhome_shm::SharedMemory &shm_;
- const Type type_;
+ bool RunningNoLock() { return !workers_.empty(); }
+
+ Shm &shm_;
std::vector<std::thread> workers_;
std::mutex mutex_;
std::atomic<bool> run_;
std::unique_ptr<Queue> mq_;
- std::unordered_map<std::string, RecvCB> async_cbs_;
};
#endif // end of include guard: SOCKET_GWTJHBPO
--
Gitblit v1.8.0