Using C++ strings.

[simgrid.git] / src / mc / api.hpp

diff --git a/src/mc/api.hpp b/src/mc/api.hpp
index 1a2faf19198c92fc367c2162961c2aba27b0a655..d4280d4d0c81f842586d168b16789ce971942502 100644 (file)
--- a/src/mc/api.hpp
+++ b/src/mc/api.hpp
@@ -18,14 +18,14 @@ namespace mc {
 /**
  * @brief Maintains the transition's information.
  */
-struct s_udpor_transition {
+struct s_transition_detail {
   simgrid::simix::Simcall call_ = simgrid::simix::Simcall::NONE;
   long issuer_id                = -1;
   RemotePtr<kernel::activity::MailboxImpl> mbox_remote_addr {}; // used to represent mailbox remote address for isend and ireceive transitions
   RemotePtr<kernel::activity::ActivityImpl> comm_remote_addr {}; // the communication this transition concerns (to be used only for isend, ireceive, wait and test)
 };
 
-typedef std::unique_ptr<s_udpor_transition> udpor_transition_t;
+using transition_detail_t = std::unique_ptr<s_transition_detail>;
 
 /*
 ** This class aimes to implement FACADE APIs for simgrid. The FACADE layer sits between the CheckerSide
@@ -49,7 +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;
+  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:
@@ -79,7 +81,7 @@ public:
   unsigned long get_pattern_comm_src_proc(RemotePtr<kernel::activity::CommImpl> const& addr) const;
   unsigned long get_pattern_comm_dst_proc(RemotePtr<kernel::activity::CommImpl> const& addr) const;
   std::vector<char> get_pattern_comm_data(RemotePtr<kernel::activity::CommImpl> 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
@@ -102,17 +104,15 @@ 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;
 
   // UDPOR APIs
-  std::list<udpor_transition_t> get_enabled_transitions(simgrid::mc::State* state);
+  std::list<transition_detail_t> get_enabled_transitions(simgrid::mc::State* state);
 
   // 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<kernel::activity::MailboxImpl> get_mbox_remote_addr(smx_simcall_t const req) const;
@@ -135,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