From 92cfd3dc96cc1a8f7c69707c80aaf70d61cbcbbf Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Fri, 2 Apr 2021 09:55:05 +0200 Subject: [PATCH] Make mc::Api::get_actor_name return a const&. Sometimes avoids unnecessary copies. --- src/mc/api.cpp | 4 ++-- src/mc/api.hpp | 2 +- src/mc/remote/RemoteProcess.hpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mc/api.cpp b/src/mc/api.cpp index d9e32e9f60..ec0b7e3011 100644 --- a/src/mc/api.cpp +++ b/src/mc/api.cpp @@ -379,7 +379,7 @@ xbt::string const& Api::get_actor_host_name(smx_actor_t actor) const return *info->hostname; } -std::string Api::get_actor_name(smx_actor_t actor) const +xbt::string const& Api::get_actor_name(smx_actor_t actor) const { if (mc_model_checker == nullptr) return actor->get_name(); @@ -400,7 +400,7 @@ std::string Api::get_actor_string(smx_actor_t actor) const if (actor) { res = "(" + std::to_string(actor->get_pid()) + ")"; if (actor->get_host()) - res += std::string(get_actor_host_name(actor)) + " (" + get_actor_name(actor) + ")"; + res += std::string(get_actor_host_name(actor)) + " (" + std::string(get_actor_name(actor)) + ")"; else res += get_actor_name(actor); } else diff --git a/src/mc/api.hpp b/src/mc/api.hpp index f3df834df4..548bbe85a3 100644 --- a/src/mc/api.hpp +++ b/src/mc/api.hpp @@ -78,7 +78,7 @@ public: unsigned long get_pattern_comm_src_proc(RemotePtr const& addr) const; unsigned long get_pattern_comm_dst_proc(RemotePtr const& addr) const; std::vector get_pattern_comm_data(RemotePtr const& addr) const; - std::string get_actor_name(smx_actor_t actor) const; + xbt::string const& get_actor_name(smx_actor_t actor) const; xbt::string const& get_actor_host_name(smx_actor_t actor) const; #if HAVE_SMPI bool check_send_request_detached(smx_simcall_t const& simcall) const; diff --git a/src/mc/remote/RemoteProcess.hpp b/src/mc/remote/RemoteProcess.hpp index 2530d130b5..19df38380d 100644 --- a/src/mc/remote/RemoteProcess.hpp +++ b/src/mc/remote/RemoteProcess.hpp @@ -27,7 +27,7 @@ public: /** Hostname (owned by `mc_model_checker->hostnames_`) */ const xbt::string* hostname = nullptr; - std::string name; + xbt::string name; void clear() { -- 2.20.1