From 1f3729698a131b3f701f67adb6a1258aa1235dce Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期二, 20 四月 2021 15:43:53 +0800
Subject: [PATCH] api server callback change tag to src; refactor.
---
src/socket.h | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/socket.h b/src/socket.h
index 493aeb4..bbf3851 100644
--- a/src/socket.h
+++ b/src/socket.h
@@ -66,17 +66,17 @@
size_t Pending() const { return mq().Pending(); }
template <class Body>
- bool Send(const void *valid_remote, BHMsgHead &head, Body &body, const RecvCB &cb = RecvCB())
+ bool Send(const void *valid_remote, BHMsgHead &head, Body &body, RecvCB &&cb = RecvCB())
{
try {
if (!cb) {
return SendImpl(valid_remote, MsgI::Serialize(head, body));
} else {
std::string msg_id(head.msg_id());
- per_msg_cbs_->Add(msg_id, cb);
+ per_msg_cbs_->Store(msg_id, std::move(cb));
auto onExpireRemoveCB = [this, msg_id](SendQ::Data const &msg) {
RecvCB cb_no_use;
- per_msg_cbs_->Find(msg_id, cb_no_use);
+ per_msg_cbs_->Pick(msg_id, cb_no_use);
};
return SendImpl(valid_remote, MsgI::Serialize(head, body), onExpireRemoveCB);
}
@@ -117,7 +117,7 @@
};
std::unique_lock<std::mutex> lk(st->mutex);
- bool sendok = Send(remote, head, body, OnRecv);
+ bool sendok = Send(remote, head, body, std::move(OnRecv));
if (!sendok) {
printf("send timeout\n");
}
@@ -154,8 +154,8 @@
public:
bool empty() const { return store_.empty(); }
- bool Add(const std::string &id, const RecvCB &cb) { return store_.emplace(id, cb).second; }
- bool Find(const std::string &id, RecvCB &cb)
+ bool Store(const std::string &id, RecvCB &&cb) { return store_.emplace(id, std::move(cb)).second; }
+ bool Pick(const std::string &id, RecvCB &cb)
{
auto pos = store_.find(id);
if (pos != store_.end()) {
--
Gitblit v1.8.0