diff options
author | stickies-v <stickies-v@protonmail.com> | 2022-11-30 17:16:04 +0000 |
---|---|---|
committer | stickies-v <stickies-v@protonmail.com> | 2023-01-18 17:08:58 +0000 |
commit | 545ff924ab6303ffabd91fdfc4f0a4962daf133c (patch) | |
tree | 2d6fd50f133eed48925d290469fdfed6dbd7cea2 | |
parent | 7727603e44f8f674e0fc8389e78047e2b56e6052 (diff) | |
download | bitcoin-545ff924ab6303ffabd91fdfc4f0a4962daf133c.tar.xz |
refactor: use string_view for RPC named argument values
Minimize copying RPC named argument values when calling .substr() by
using std::string_view instead of std::string.
-rw-r--r-- | src/rpc/client.cpp | 25 | ||||
-rw-r--r-- | src/rpc/client.h | 5 | ||||
-rw-r--r-- | src/univalue/include/univalue.h | 5 |
3 files changed, 20 insertions, 15 deletions
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp index a94c7e8c29..2ef79eb501 100644 --- a/src/rpc/client.cpp +++ b/src/rpc/client.cpp @@ -4,10 +4,13 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include <rpc/client.h> +#include <tinyformat.h> #include <util/system.h> #include <set> #include <stdint.h> +#include <string> +#include <string_view> class CRPCConvertParam { @@ -228,15 +231,15 @@ public: CRPCConvertTable(); /** Return arg_value as UniValue, and first parse it if it is a non-string parameter */ - UniValue ArgToUniValue(const std::string& arg_value, const std::string& method, int param_idx) + UniValue ArgToUniValue(std::string_view arg_value, const std::string& method, int param_idx) { - return members.count(std::make_pair(method, param_idx)) > 0 ? ParseNonRFCJSONValue(arg_value) : arg_value; + return members.count({method, param_idx}) > 0 ? ParseNonRFCJSONValue(arg_value) : arg_value; } /** Return arg_value as UniValue, and first parse it if it is a non-string parameter */ - UniValue ArgToUniValue(const std::string& arg_value, const std::string& method, const std::string& param_name) + UniValue ArgToUniValue(std::string_view arg_value, const std::string& method, const std::string& param_name) { - return membersByName.count(std::make_pair(method, param_name)) > 0 ? ParseNonRFCJSONValue(arg_value) : arg_value; + return membersByName.count({method, param_name}) > 0 ? ParseNonRFCJSONValue(arg_value) : arg_value; } }; @@ -253,10 +256,10 @@ static CRPCConvertTable rpcCvtTable; /** Non-RFC4627 JSON parser, accepts internal values (such as numbers, true, false, null) * as well as objects and arrays. */ -UniValue ParseNonRFCJSONValue(const std::string& raw) +UniValue ParseNonRFCJSONValue(std::string_view raw) { UniValue parsed; - if (!parsed.read(raw)) throw std::runtime_error(std::string("Error parsing JSON: ") + raw); + if (!parsed.read(raw)) throw std::runtime_error(tfm::format("Error parsing JSON: %s", raw)); return parsed; } @@ -265,8 +268,8 @@ UniValue RPCConvertValues(const std::string &strMethod, const std::vector<std::s UniValue params(UniValue::VARR); for (unsigned int idx = 0; idx < strParams.size(); idx++) { - const std::string& strVal = strParams[idx]; - params.push_back(rpcCvtTable.ArgToUniValue(strVal, strMethod, idx)); + std::string_view value{strParams[idx]}; + params.push_back(rpcCvtTable.ArgToUniValue(value, strMethod, idx)); } return params; @@ -277,15 +280,15 @@ UniValue RPCConvertNamedValues(const std::string &strMethod, const std::vector<s UniValue params(UniValue::VOBJ); UniValue positional_args{UniValue::VARR}; - for (const std::string &s: strParams) { + for (std::string_view s: strParams) { size_t pos = s.find('='); if (pos == std::string::npos) { positional_args.push_back(rpcCvtTable.ArgToUniValue(s, strMethod, positional_args.size())); continue; } - std::string name = s.substr(0, pos); - std::string value = s.substr(pos+1); + std::string name{s.substr(0, pos)}; + std::string_view value{s.substr(pos+1)}; // Intentionally overwrite earlier named values with later ones as a // convenience for scripts and command line users that want to merge diff --git a/src/rpc/client.h b/src/rpc/client.h index 644081ac22..3c5c4fc4d6 100644 --- a/src/rpc/client.h +++ b/src/rpc/client.h @@ -6,6 +6,9 @@ #ifndef BITCOIN_RPC_CLIENT_H #define BITCOIN_RPC_CLIENT_H +#include <string> +#include <string_view> + #include <univalue.h> /** Convert positional arguments to command-specific RPC representation */ @@ -17,6 +20,6 @@ UniValue RPCConvertNamedValues(const std::string& strMethod, const std::vector<s /** Non-RFC4627 JSON parser, accepts internal values (such as numbers, true, false, null) * as well as objects and arrays. */ -UniValue ParseNonRFCJSONValue(const std::string& raw); +UniValue ParseNonRFCJSONValue(std::string_view raw); #endif // BITCOIN_RPC_CLIENT_H diff --git a/src/univalue/include/univalue.h b/src/univalue/include/univalue.h index 16853260b8..d501c3fb69 100644 --- a/src/univalue/include/univalue.h +++ b/src/univalue/include/univalue.h @@ -12,6 +12,7 @@ #include <map> #include <stdexcept> #include <string> +#include <string_view> #include <type_traits> #include <vector> @@ -95,9 +96,7 @@ public: bool read(const char *raw, size_t len); bool read(const char *raw) { return read(raw, strlen(raw)); } - bool read(const std::string& rawStr) { - return read(rawStr.data(), rawStr.size()); - } + bool read(std::string_view raw) { return read(raw.data(), raw.size()); } private: UniValue::VType typ; |