X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1a64ca4c11a1eb7ba2ecd102f877ac571486a034..74fb54e5f7dc2b1f05ff1b239f1a2418c5f3e2e3:/src/mc/api.hpp diff --git a/src/mc/api.hpp b/src/mc/api.hpp index b2a5e8c3ee..d4280d4d0c 100644 --- a/src/mc/api.hpp +++ b/src/mc/api.hpp @@ -49,8 +49,9 @@ private: simgrid::kernel::activity::CommImpl* get_comm(smx_simcall_t const r) const; bool request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2) const; simgrid::mc::ActorInformation* actor_info_cast(smx_actor_t actor) const; - const char* actor_get_host_name(smx_actor_t actor) const; - const char* actor_get_name(smx_actor_t actor) const; + std::string get_actor_name(smx_actor_t actor) const; + std::string get_actor_string(smx_actor_t actor) const; + std::string get_actor_string2(smx_actor_t actor) const; public: // No copy: @@ -80,7 +81,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; - const char* get_actor_host_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; #endif @@ -103,7 +104,6 @@ public: void handle_simcall(Transition const& transition) const; void mc_wait_for_requests() const; XBT_ATTRIB_NORETURN void mc_exit(int status) const; - std::string const& mc_get_host_name(std::string const& hostname) const; void dump_record_path() const; smx_simcall_t mc_state_choose_request(simgrid::mc::State* state) const; @@ -113,7 +113,6 @@ public: // SIMCALL APIs std::string request_to_string(smx_simcall_t req, int value, RequestType request_type) const; std::string request_get_dot_output(smx_simcall_t req, int value) const; - const char* simcall_get_name(simgrid::simix::Simcall kind) const; smx_actor_t simcall_get_issuer(s_smx_simcall const* req) const; long simcall_get_actor_id(s_smx_simcall const* req) const; RemotePtr get_mbox_remote_addr(smx_simcall_t const req) const; @@ -136,7 +135,7 @@ public: // SESSION APIs void session_initialize() const; void s_close() const; - void execute(Transition const& transition) const; + void execute(Transition& transition, smx_simcall_t simcall) const; // AUTOMATION APIs #if SIMGRID_HAVE_MC