From 2250af06ba0524f0777944d96e1e328abc2dfe18 Mon Sep 17 00:00:00 2001
From: Arne Juul <arnej@verizonmedia.com>
Date: Mon, 15 Feb 2021 14:00:38 +0000
Subject: use size literals in messagebus

---
 messagebus/src/vespa/messagebus/messagebusparams.cpp      |  3 ++-
 messagebus/src/vespa/messagebus/network/rpcnetwork.cpp    | 15 ++++++++-------
 .../src/vespa/messagebus/network/rpcnetworkparams.cpp     |  5 +++--
 messagebus/src/vespa/messagebus/network/rpcsendv2.cpp     | 11 ++++++-----
 4 files changed, 19 insertions(+), 15 deletions(-)

(limited to 'messagebus')

diff --git a/messagebus/src/vespa/messagebus/messagebusparams.cpp b/messagebus/src/vespa/messagebus/messagebusparams.cpp
index d83d0845b85..7d5befb5d1a 100644
--- a/messagebus/src/vespa/messagebus/messagebusparams.cpp
+++ b/messagebus/src/vespa/messagebus/messagebusparams.cpp
@@ -1,6 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include "messagebus.h"
 #include <vespa/messagebus/routing/retrytransienterrorspolicy.h>
+#include <vespa/vespalib/util/size_literals.h>
 
 namespace mbus {
 
@@ -8,7 +9,7 @@ MessageBusParams::MessageBusParams() :
     _protocols(),
     _retryPolicy(new RetryTransientErrorsPolicy()),
     _maxPendingCount(1024),
-    _maxPendingSize(128 * 1024 * 1024)
+    _maxPendingSize(128_Mi)
 { }
 
 MessageBusParams::~MessageBusParams() {}
diff --git a/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp b/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp
index 9ecc57fd9de..34ba486d0c9 100644
--- a/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp
+++ b/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp
@@ -5,19 +5,20 @@
 #include "rpcsendv2.h"
 #include "rpctargetpool.h"
 #include "rpcnetworkparams.h"
+#include <vespa/fnet/frt/supervisor.h>
+#include <vespa/fnet/scheduler.h>
+#include <vespa/fnet/transport.h>
+#include <vespa/messagebus/emptyreply.h>
 #include <vespa/messagebus/errorcode.h>
 #include <vespa/messagebus/iprotocol.h>
-#include <vespa/messagebus/emptyreply.h>
 #include <vespa/messagebus/routing/routingnode.h>
-#include <vespa/slobrok/sbregister.h>
 #include <vespa/slobrok/sbmirror.h>
+#include <vespa/slobrok/sbregister.h>
 #include <vespa/vespalib/component/vtag.h>
 #include <vespa/vespalib/stllike/asciistream.h>
+#include <vespa/vespalib/util/size_literals.h>
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/vespalib/util/threadstackexecutor.h>
-#include <vespa/fnet/scheduler.h>
-#include <vespa/fnet/transport.h>
-#include <vespa/fnet/frt/supervisor.h>
 #include <vespa/fastos/thread.h>
 #include <thread>
 
@@ -134,8 +135,8 @@ RPCNetwork::RPCNetwork(const RPCNetworkParams &params) :
     _requestedPort(params.getListenPort()),
     _targetPool(std::make_unique<RPCTargetPool>(params.getConnectionExpireSecs())),
     _targetPoolTask(std::make_unique<TargetPoolTask>(_scheduler, *_targetPool)),
-    _servicePool(std::make_unique<RPCServicePool>(*_mirror, 4096)),
-    _executor(std::make_unique<vespalib::ThreadStackExecutor>(params.getNumThreads(), 65536)),
+    _servicePool(std::make_unique<RPCServicePool>(*_mirror, 4_Ki)),
+    _executor(std::make_unique<vespalib::ThreadStackExecutor>(params.getNumThreads(), 64_Ki)),
     _sendV1(std::make_unique<RPCSendV1>()),
     _sendV2(std::make_unique<RPCSendV2>()),
     _sendAdapters(),
diff --git a/messagebus/src/vespa/messagebus/network/rpcnetworkparams.cpp b/messagebus/src/vespa/messagebus/network/rpcnetworkparams.cpp
index 01d1cd918a7..c90e48cb5e5 100644
--- a/messagebus/src/vespa/messagebus/network/rpcnetworkparams.cpp
+++ b/messagebus/src/vespa/messagebus/network/rpcnetworkparams.cpp
@@ -1,6 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "rpcnetworkparams.h"
+#include <vespa/vespalib/util/size_literals.h>
 
 namespace mbus {
 
@@ -12,8 +13,8 @@ RPCNetworkParams::RPCNetworkParams(config::ConfigUri configUri) :
     _identity(Identity("")),
     _slobrokConfig(std::move(configUri)),
     _listenPort(0),
-    _maxInputBufferSize(256*1024),
-    _maxOutputBufferSize(256*1024),
+    _maxInputBufferSize(256_Ki),
+    _maxOutputBufferSize(256_Ki),
     _numThreads(4),
     _tcpNoDelay(true),
     _dispatchOnEncode(true),
diff --git a/messagebus/src/vespa/messagebus/network/rpcsendv2.cpp b/messagebus/src/vespa/messagebus/network/rpcsendv2.cpp
index a2e3310046d..3e9a35ac7de 100644
--- a/messagebus/src/vespa/messagebus/network/rpcsendv2.cpp
+++ b/messagebus/src/vespa/messagebus/network/rpcsendv2.cpp
@@ -3,13 +3,14 @@
 #include "rpcsendv2.h"
 #include "rpcnetwork.h"
 #include "rpcserviceaddress.h"
+#include <vespa/fnet/frt/reflection.h>
 #include <vespa/messagebus/emptyreply.h>
 #include <vespa/messagebus/error.h>
-#include <vespa/vespalib/util/stringfmt.h>
-#include <vespa/vespalib/data/slime/slime.h>
 #include <vespa/vespalib/data/databuffer.h>
+#include <vespa/vespalib/data/slime/slime.h>
 #include <vespa/vespalib/util/compressor.h>
-#include <vespa/fnet/frt/reflection.h>
+#include <vespa/vespalib/util/size_literals.h>
+#include <vespa/vespalib/util/stringfmt.h>
 
 using vespalib::make_string;
 using vespalib::compression::CompressionConfig;
@@ -124,7 +125,7 @@ RPCSendV2::encodeRequest(FRT_RPCRequest &req, const Version &version, const Rout
     root.setLong(TRACELEVEL_F, traceLevel);
     filler.fill(BLOB_F, root);
 
-    OutputBuf rBuf(8192);
+    OutputBuf rBuf(8_Ki);
     BinaryFormat::encode(slime, rBuf);
     ConstBufferRef toCompress(rBuf.getBuf().getData(), rBuf.getBuf().getDataLen());
     DataBuffer buf(vespalib::roundUp2inN(rBuf.getBuf().getDataLen()));
@@ -254,7 +255,7 @@ RPCSendV2::createResponse(FRT_Values & ret, const string & version, Reply & repl
         }
     }
 
-    OutputBuf rBuf(8192);
+    OutputBuf rBuf(8_Ki);
     BinaryFormat::encode(slime, rBuf);
     ConstBufferRef toCompress(rBuf.getBuf().getData(), rBuf.getBuf().getDataLen());
     DataBuffer buf(vespalib::roundUp2inN(rBuf.getBuf().getDataLen()));
-- 
cgit v1.2.3