summaryrefslogtreecommitdiffstats
path: root/messagebus
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2020-03-26 22:42:53 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2020-03-26 22:42:53 +0000
commit9a448a86c87d6c2878c55443b66255fc0c23feb7 (patch)
tree21fd29e7b100f4b1de7bf7b24868c6c463fc4b9c /messagebus
parentbc53d8bfa546fbffc0c0ef7ae6ab1050ac75147a (diff)
Fix typos
Diffstat (limited to 'messagebus')
-rw-r--r--messagebus/src/vespa/messagebus/network/rpcnetwork.cpp2
-rw-r--r--messagebus/src/vespa/messagebus/network/rpcnetwork.h3
-rw-r--r--messagebus/src/vespa/messagebus/network/rpcsend.cpp6
3 files changed, 6 insertions, 5 deletions
diff --git a/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp b/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp
index 1ddadf424ec..a35b60bc1d8 100644
--- a/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp
+++ b/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp
@@ -90,7 +90,7 @@ RPCNetwork::SendContext::handleVersion(const vespalib::Version *version)
}
if (shouldSend) {
if (_net.allowDispatchForEncode()) {
- auto rejected = _net.getExecutor(true).execute(vespalib::makeLambdaTask([this]() {
+ auto rejected = _net.getEncodeExecutor(true).execute(vespalib::makeLambdaTask([this]() {
_net.send(*this);
delete this;
}));
diff --git a/messagebus/src/vespa/messagebus/network/rpcnetwork.h b/messagebus/src/vespa/messagebus/network/rpcnetwork.h
index 6f76af4a68f..8643beb20fa 100644
--- a/messagebus/src/vespa/messagebus/network/rpcnetwork.h
+++ b/messagebus/src/vespa/messagebus/network/rpcnetwork.h
@@ -233,7 +233,8 @@ public:
const slobrok::api::IMirrorAPI &getMirror() const override;
CompressionConfig getCompressionConfig() { return _compressionConfig; }
void invoke(FRT_RPCRequest *req);
- vespalib::Executor & getExecutor(bool requireSequencing, bool encode) const { return requireSequencing ? (encode ? *_singleEncodeExecutor : singleDecodeExecutor) : *_executor; }
+ vespalib::Executor & getEncodeExecutor(bool requireSequencing) const { return requireSequencing ? *_singleEncodeExecutor : *_executor; }
+ vespalib::Executor & getDecodeExecutor(bool requireSequencing) const { return requireSequencing ? *_singleDecodeExecutor : *_executor; }
bool allowDispatchForEncode() const { return _allowDispatchForEncode; }
bool allowDispatchForDecode() const { return _allowDispatchForDecode; }
diff --git a/messagebus/src/vespa/messagebus/network/rpcsend.cpp b/messagebus/src/vespa/messagebus/network/rpcsend.cpp
index 820f058300f..a40360ead71 100644
--- a/messagebus/src/vespa/messagebus/network/rpcsend.cpp
+++ b/messagebus/src/vespa/messagebus/network/rpcsend.cpp
@@ -149,7 +149,7 @@ void
RPCSend::RequestDone(FRT_RPCRequest *req)
{
if ( _net->allowDispatchForDecode()) {
- auto rejected = _net->getExecutor(true).execute(makeLambdaTask([this, req]() {
+ auto rejected = _net->getDecodeExecutor(true).execute(makeLambdaTask([this, req]() {
doRequestDone(req);
}));
assert (!rejected);
@@ -229,7 +229,7 @@ RPCSend::handleReply(Reply::UP reply)
{
const IProtocol * protocol = _net->getOwner().getProtocol(reply->getProtocol());
if (_net->allowDispatchForEncode()) {
- auto rejected = _net->getExecutor(protocol->requireSequencing()).execute(makeLambdaTask([this, protocol, reply = std::move(reply)]() mutable {
+ auto rejected = _net->getEncodeExecutor(protocol->requireSequencing()).execute(makeLambdaTask([this, protocol, reply = std::move(reply)]() mutable {
doHandleReply(protocol, std::move(reply));
}));
assert (!rejected);
@@ -274,7 +274,7 @@ RPCSend::invoke(FRT_RPCRequest *req)
return;
}
if (_net->allowDispatchForDecode()) {
- auto rejected = _net->getExecutor(protocol->requireSequencing()).execute(makeLambdaTask([this, req, protocol, params = std::move(params)]() mutable {
+ auto rejected = _net->getDecodeExecutor(protocol->requireSequencing()).execute(makeLambdaTask([this, req, protocol, params = std::move(params)]() mutable {
doRequest(req, protocol, std::move(params));
}));
assert (!rejected);