From 98e0955991440071e69d9a259434dbb0c357a6aa Mon Sep 17 00:00:00 2001 From: Gabriel Corona Date: Thu, 3 Mar 2016 18:05:34 +0100 Subject: [PATCH] [mc] Remove the mc_smx_process_info typedefs --- src/mc/Process.cpp | 4 ++-- src/mc/Process.hpp | 2 +- src/mc/mc_forward.hpp | 3 --- src/mc/mc_smx.cpp | 16 ++++++++-------- src/mc/mc_smx.h | 4 +--- 5 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/mc/Process.cpp b/src/mc/Process.cpp index c4c951a8c8..8ae6fff9b4 100644 --- a/src/mc/Process.cpp +++ b/src/mc/Process.cpp @@ -698,11 +698,11 @@ void Process::ignore_local_variable(const char *var_name, const char *frame_name info->remove_local_variable(var_name, frame_name); } -boost::iterator_range Process::simix_processes() +boost::iterator_range Process::simix_processes() { xbt_assert(mc_mode != MC_MODE_CLIENT); MC_process_smx_refresh(&mc_model_checker->process()); - return boost::iterator_range( + return boost::iterator_range( &*smx_process_infos.begin(), &*smx_process_infos.end()); } diff --git a/src/mc/Process.hpp b/src/mc/Process.hpp index d8a3af5083..aa934047eb 100644 --- a/src/mc/Process.hpp +++ b/src/mc/Process.hpp @@ -217,7 +217,7 @@ public: void ignore_local_variable(const char *var_name, const char *frame_name); int socket() { return socket_; } - simgrid::xbt::DynarRange simix_processes(); + simgrid::xbt::DynarRange simix_processes(); private: void init_memory_map_info(); diff --git a/src/mc/mc_forward.hpp b/src/mc/mc_forward.hpp index 9474e9beca..b71caabc3f 100644 --- a/src/mc/mc_forward.hpp +++ b/src/mc/mc_forward.hpp @@ -31,9 +31,6 @@ class SimixProcessInformation; } } -// TODO, remove -typedef simgrid::mc::SimixProcessInformation s_mc_smx_process_info; - // TODO, try to get rid of the global ModelChecker variable extern simgrid::mc::ModelChecker* mc_model_checker; diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp index 900e372c54..409834af3b 100644 --- a/src/mc/mc_smx.cpp +++ b/src/mc/mc_smx.cpp @@ -29,13 +29,13 @@ bool is_in_vector(smx_process_t p, std::vectorprocess().smx_process_infos) || is_in_vector(p, mc_model_checker->process().smx_old_process_infos)); - mc_smx_process_info_t process_info = - (mc_smx_process_info_t) - ((char*) p - offsetof(s_mc_smx_process_info_t, copy)); + simgrid::mc::SimixProcessInformation* process_info = + (simgrid::mc::SimixProcessInformation*) + ((char*) p - offsetof(simgrid::mc::SimixProcessInformation, copy)); return process_info; } @@ -133,14 +133,14 @@ smx_process_t MC_smx_resolve_process(smx_process_t process_remote_address) if (mc_mode == MC_MODE_CLIENT) return process_remote_address; - mc_smx_process_info_t process_info = MC_smx_resolve_process_info(process_remote_address); + simgrid::mc::SimixProcessInformation* process_info = MC_smx_resolve_process_info(process_remote_address); if (process_info) return &process_info->copy; else return nullptr; } -mc_smx_process_info_t MC_smx_resolve_process_info(smx_process_t process_remote_address) +simgrid::mc::SimixProcessInformation* MC_smx_resolve_process_info(smx_process_t process_remote_address) { if (mc_mode == MC_MODE_CLIENT) xbt_die("No process_info for local process is not enabled."); @@ -179,7 +179,7 @@ const char* MC_smx_process_get_host_name(smx_process_t p) const size_t offset = (char*) &foo.host.name() - (char*) &foo.host; // Read the simgrid::xbt::string in the MCed process: - mc_smx_process_info_t info = MC_smx_process_get_info(p); + simgrid::mc::SimixProcessInformation* info = MC_smx_process_get_info(p); simgrid::xbt::string_data remote_string; auto remote_string_address = remote( (simgrid::xbt::string_data*) ((char*) p->host + offset)); @@ -198,7 +198,7 @@ const char* MC_smx_process_get_name(smx_process_t p) if (!p->name) return nullptr; - mc_smx_process_info_t info = MC_smx_process_get_info(p); + simgrid::mc::SimixProcessInformation* info = MC_smx_process_get_info(p); if (info->name.empty()) { char* name = process->read_string(p->name); info->name = name; diff --git a/src/mc/mc_smx.h b/src/mc/mc_smx.h index 0d7e87fade..d83a73e0cc 100644 --- a/src/mc/mc_smx.h +++ b/src/mc/mc_smx.h @@ -43,8 +43,6 @@ SG_BEGIN_DECL() -typedef s_mc_smx_process_info s_mc_smx_process_info_t, *mc_smx_process_info_t; - XBT_PRIVATE void MC_process_smx_refresh(simgrid::mc::Process* process); /** Get the issuer of a simcall (`req->issuer`) @@ -70,7 +68,7 @@ XBT_PRIVATE int MC_smpi_process_count(void); XBT_PRIVATE smx_process_t MC_smx_resolve_process(smx_process_t process_remote_address); /** Get the process info structure from the process remote address */ -XBT_PRIVATE mc_smx_process_info_t MC_smx_resolve_process_info(smx_process_t process_remote_address); +XBT_PRIVATE simgrid::mc::SimixProcessInformation* MC_smx_resolve_process_info(smx_process_t process_remote_address); XBT_PRIVATE unsigned long MC_smx_get_maxpid(void); -- 2.20.1