X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/492c467dc0dadb58aba6e9bb10df6e0c78b2765f..afc02b710464a9814170c8aa0a269efbf11ff2c3:/src/kernel/actor/CommObserver.hpp diff --git a/src/kernel/actor/CommObserver.hpp b/src/kernel/actor/CommObserver.hpp index 0fbd7973eb..c8e2c8c3fb 100644 --- a/src/kernel/actor/CommObserver.hpp +++ b/src/kernel/actor/CommObserver.hpp @@ -12,6 +12,7 @@ #include "xbt/asserts.h" #include +#include namespace simgrid::kernel::actor { @@ -20,7 +21,7 @@ class ActivityTestSimcall final : public ResultingSimcall { std::string fun_call_; public: - ActivityTestSimcall(ActorImpl* actor, activity::ActivityImpl* activity, std::string fun_call = "") + ActivityTestSimcall(ActorImpl* actor, activity::ActivityImpl* activity, std::string_view fun_call) : ResultingSimcall(actor, true), activity_(activity), fun_call_(fun_call) { } @@ -37,7 +38,7 @@ class ActivityTestanySimcall final : public ResultingSimcall { public: ActivityTestanySimcall(ActorImpl* actor, const std::vector& activities, - std::string fun_call = "none"); + std::string_view fun_call); bool is_enabled() override { return true; /* can return -1 if no activity is ready */ } void serialize(std::stringstream& stream) const override; std::string to_string() const override; @@ -53,7 +54,7 @@ class ActivityWaitSimcall final : public ResultingSimcall { std::string fun_call_; public: - ActivityWaitSimcall(ActorImpl* actor, activity::ActivityImpl* activity, double timeout, std::string fun_call = "none") + ActivityWaitSimcall(ActorImpl* actor, activity::ActivityImpl* activity, double timeout, std::string_view fun_call) : ResultingSimcall(actor, false), activity_(activity), timeout_(timeout), fun_call_(fun_call) { } @@ -74,7 +75,7 @@ class ActivityWaitanySimcall final : public ResultingSimcall { public: ActivityWaitanySimcall(ActorImpl* actor, const std::vector& activities, double timeout, - std::string fun_call = "none"); + std::string_view fun_call); bool is_enabled() override; void serialize(std::stringstream& stream) const override; std::string to_string() const override; @@ -109,7 +110,7 @@ public: const std::function& clean_fun, // used to free the synchro in case of problem after a detached send const std::function& copy_data_fun, // used to copy data if not default one - void* payload, bool detached, std::string fun_call = "none") + void* payload, bool detached, std::string fun_call) : SimcallObserver(actor) , mbox_(mbox) , payload_size_(payload_size) @@ -159,7 +160,7 @@ public: CommIrecvSimcall(ActorImpl* actor, activity::MailboxImpl* mbox, unsigned char* dst_buff, size_t* dst_buff_size, const std::function& match_fun, const std::function& copy_data_fun, void* payload, - double rate, std::string fun_call = "none") + double rate, std::string fun_call) : SimcallObserver(actor) , mbox_(mbox) , dst_buff_(dst_buff)