From 1b52f1cb8c47dd2c0195d2fd65d7b6a4c2f10704 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期一, 12 四月 2021 18:29:41 +0800
Subject: [PATCH] add fail-resend support.
---
src/socket.h | 148 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 121 insertions(+), 27 deletions(-)
diff --git a/src/socket.h b/src/socket.h
index b94eca2..5973ab6 100644
--- a/src/socket.h
+++ b/src/socket.h
@@ -19,58 +19,152 @@
#ifndef SOCKET_GWTJHBPO
#define SOCKET_GWTJHBPO
+#include "bh_util.h"
+#include "defs.h"
#include "shm_queue.h"
#include <atomic>
#include <boost/noncopyable.hpp>
+#include <condition_variable>
#include <functional>
#include <memory>
#include <mutex>
#include <thread>
#include <vector>
+using namespace bhome_msg;
+
class ShmSocket : private boost::noncopyable
{
+ template <class DoSend>
+ inline bool SendImpl(MsgI &msg, const int timeout_ms, const DoSend &doSend)
+ {
+ bool r = false;
+ DEFER1(if (msg.IsCounted() || !r) { msg.Release(shm()); });
+ r = doSend(msg);
+ return r;
+ }
+
+protected:
typedef bhome_shm::ShmMsgQueue Queue;
public:
- enum Type {
- eSockRequest,
- eSockReply,
- eSockSubscribe,
- eSockPublish,
- eSockBus,
- };
- typedef std::function<void(bhome_msg::BHMsg &msg)> RecvCB;
- typedef std::function<void(bhome_msg::MsgI &imsg)> RecvRawCB;
+ typedef bhome_shm::SharedMemory Shm;
+ typedef std::function<void(ShmSocket &sock, MsgI &imsg, BHMsgHead &head)> RecvCB;
+ typedef std::function<bool(ShmSocket &sock, MsgI &imsg, BHMsgHead &head)> PartialRecvCB;
+ typedef std::function<void(ShmSocket &sock)> IdleCB;
- ShmSocket(Type type, bhome_shm::SharedMemory &shm);
- ShmSocket(Type type);
+ ShmSocket(Shm &shm, const MQId &id, const int len);
+ ShmSocket(Shm &shm, const int len = 12);
~ShmSocket();
- // bool Request(const std::string &topic, const void *data, const size_t size, onReply);
- bool RequestAndWait() { return false; } // call Request, and wait onReply notify cv
-
- // 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);
-
+ static bool Remove(SharedMemory &shm, const MQId &id) { return Queue::Remove(shm, id); }
+ const MQId &id() const { return mq().Id(); }
+ Shm &shm() { return shm_; }
// start recv.
- bool Start(const RecvCB &onData, int nworker = 1);
- bool StartRaw(const RecvRawCB &onData, int nworker = 1);
+ bool Start(int nworker = 1, const RecvCB &onData = RecvCB(), const IdleCB &onIdle = IdleCB());
+ bool Start(const RecvCB &onData, const IdleCB &onIdle, int nworker = 1) { return Start(nworker, onData, onIdle); }
+ bool Start(const RecvCB &onData, int nworker = 1) { return Start(nworker, onData); }
bool Stop();
+ size_t Pending() const { return mq().Pending(); }
+
+ bool Send(const void *valid_remote, const MsgI &imsg, const int timeout_ms)
+ {
+ assert(valid_remote);
+ return mq().Send(*static_cast<const MQId *>(valid_remote), imsg, timeout_ms);
+ }
+ //TODO reimplment, using async.
+ bool SyncRecv(MsgI &msg, bhome::msg::BHMsgHead &head, const int timeout_ms);
+
+ template <class Body>
+ bool Send(const void *valid_remote, const BHMsgHead &head, const Body &body, const int timeout_ms, const RecvCB &cb)
+ {
+ auto DoSend = [&](MsgI &msg) { return mq().Send(*static_cast<const MQId *>(valid_remote), msg, timeout_ms, [&]() { per_msg_cbs_->Add(head.msg_id(), cb); }); };
+ MsgI msg;
+ return msg.Make(shm(), head, body) && SendImpl(msg, timeout_ms, DoSend);
+ }
+
+ template <class Body>
+ bool Send(const void *valid_remote, const BHMsgHead &head, const Body &body, const int timeout_ms)
+ {
+ auto DoSend = [&](MsgI &msg) { return mq().Send(*static_cast<const MQId *>(valid_remote), msg, timeout_ms); };
+ MsgI msg;
+ return msg.Make(shm(), head, body) && SendImpl(msg, timeout_ms, DoSend);
+ }
+
+ template <class Body>
+ bool SendAndRecv(const void *remote, const BHMsgHead &head, const Body &body, MsgI &reply, BHMsgHead &reply_head, const int timeout_ms)
+ {
+ struct State {
+ std::mutex mutex;
+ std::condition_variable cv;
+ bool canceled = false;
+ };
+
+ try {
+ std::shared_ptr<State> st(new State);
+ auto endtime = std::chrono::steady_clock::now() + std::chrono::milliseconds(timeout_ms);
+
+ auto OnRecv = [st, &reply, &reply_head](ShmSocket &sock, MsgI &msg, BHMsgHead &head) {
+ std::unique_lock<std::mutex> lk(st->mutex);
+ if (!st->canceled) {
+ reply.swap(msg);
+ reply_head.Swap(&head);
+ st->cv.notify_one();
+ } else { // ignore
+ }
+ };
+
+ std::unique_lock<std::mutex> lk(st->mutex);
+ bool sendok = Send(remote, head, body, timeout_ms, OnRecv);
+ if (!sendok) {
+ printf("send timeout\n");
+ }
+ if (sendok && st->cv.wait_until(lk, endtime) == std::cv_status::no_timeout) {
+ return true;
+ } else {
+ st->canceled = true;
+ return false;
+ }
+ } catch (...) {
+ return false;
+ }
+ }
+
+protected:
+ 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_; }
private:
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_;
+ Queue mq_;
+ class AsyncCBs
+ {
+ std::unordered_map<std::string, RecvCB> store_;
+
+ public:
+ bool Add(const std::string &id, const RecvCB &cb) { return store_.emplace(id, cb).second; }
+ bool Find(const std::string &id, RecvCB &cb)
+ {
+ auto pos = store_.find(id);
+ if (pos != store_.end()) {
+ cb.swap(pos->second);
+ store_.erase(pos);
+ return true;
+ } else {
+ return false;
+ }
+ }
+ };
+
+ Synced<AsyncCBs> per_msg_cbs_;
};
#endif // end of include guard: SOCKET_GWTJHBPO
--
Gitblit v1.8.0