X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bc48db087894fd960073b3120cebf90e6b2f8c02..2889cfd6832bf3e721b22639f8ed06aef6da734a:/src/mc/mc_smx.cpp diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp index ef15f63ef5..f1df2aa566 100644 --- a/src/mc/mc_smx.cpp +++ b/src/mc/mc_smx.cpp @@ -7,8 +7,9 @@ #include #include +#include + #include -#include #include #include @@ -19,30 +20,25 @@ using simgrid::mc::remote; -extern "C" { - -static inline -bool is_in_vector(smx_process_t p, std::vector& ps) -{ - return (uintptr_t) p >= (uintptr_t) &ps[0] - && (uintptr_t) p < (uintptr_t) &ps[ps.size()]; -} - +/** Statically "upcast" a s_smx_process_t into a SimixProcessInformation + * + * This gets 'processInfo' from '&processInfo->copy'. It upcasts in the + * sense that we could achieve the same thing by having SimixProcessInformation + * inherit from s_smx_process_t but we don't really want to do that. + */ static inline -simgrid::mc::SimixProcessInformation* MC_smx_process_get_info(smx_process_t p) +simgrid::mc::SimixProcessInformation* process_info_cast(smx_process_t p) { - assert(is_in_vector(p, mc_model_checker->process().smx_process_infos) - || is_in_vector(p, mc_model_checker->process().smx_old_process_infos)); simgrid::mc::SimixProcessInformation* process_info = (simgrid::mc::SimixProcessInformation*) ((char*) p - offsetof(simgrid::mc::SimixProcessInformation, copy)); return process_info; } -/** Load the remote swag of processes into a dynar +/** Load the remote swag of processes into a vector * * @param process MCed process - * @param target Local dynar (to be filled with copies of `s_smx_process_t`) + * @param target Local vector (to be filled with copies of `s_smx_process_t`) * @param remote_swag Address of the process SWAG in the remote list */ static void MC_process_refresh_simix_process_list( @@ -55,7 +51,7 @@ static void MC_process_refresh_simix_process_list( s_xbt_swag_t swag; process->read_bytes(&swag, sizeof(swag), remote(remote_swag)); - // Load each element of the dynar from the MCed process: + // Load each element of the vector from the MCed process: int i = 0; for (smx_process_t p = (smx_process_t) swag.head; p; ++i) { @@ -71,29 +67,34 @@ static void MC_process_refresh_simix_process_list( assert(i == swag.count); } -void MC_process_smx_refresh(simgrid::mc::Process* process) +namespace simgrid { +namespace mc { + +void Process::refresh_simix() { - xbt_assert(mc_mode == MC_MODE_SERVER); - if (process->cache_flags & MC_PROCESS_CACHE_FLAG_SIMIX_PROCESSES) + if (this->cache_flags_ & Process::cache_simix_processes) return; // TODO, avoid to reload `&simix_global`, `simix_global`, `*simix_global` // simix_global_p = REMOTE(simix_global); smx_global_t simix_global_p; - process->read_variable("simix_global", &simix_global_p, sizeof(simix_global_p)); + this->read_variable("simix_global", &simix_global_p, sizeof(simix_global_p)); // simix_global = REMOTE(*simix_global) s_smx_global_t simix_global; - process->read_bytes(&simix_global, sizeof(simix_global), + this->read_bytes(&simix_global, sizeof(simix_global), remote(simix_global_p)); MC_process_refresh_simix_process_list( - process, process->smx_process_infos, simix_global.process_list); + this, this->smx_process_infos, simix_global.process_list); MC_process_refresh_simix_process_list( - process, process->smx_old_process_infos, simix_global.process_to_destroy); + this, this->smx_old_process_infos, simix_global.process_to_destroy); - process->cache_flags |= MC_PROCESS_CACHE_FLAG_SIMIX_PROCESSES; + this->cache_flags_ |= Process::cache_simix_processes; +} + +} } /** Get the issuer of a simcall (`req->issuer`) @@ -105,54 +106,24 @@ void MC_process_smx_refresh(simgrid::mc::Process* process) * @param process the MCed process * @param req the simcall (copied in the local process) */ -smx_process_t MC_smx_simcall_get_issuer(smx_simcall_t req) +smx_process_t MC_smx_simcall_get_issuer(s_smx_simcall_t const* req) { - if (mc_mode == MC_MODE_CLIENT) - return req->issuer; - - MC_process_smx_refresh(&mc_model_checker->process()); + xbt_assert(mc_mode == MC_MODE_SERVER); // This is the address of the smx_process in the MCed process: - void* address = req->issuer; + auto address = simgrid::mc::remote(req->issuer); // Lookup by address: - for (auto& p : mc_model_checker->process().smx_process_infos) + for (auto& p : mc_model_checker->process().simix_processes()) if (p.address == address) return &p.copy; - for (auto& p : mc_model_checker->process().smx_old_process_infos) + for (auto& p : mc_model_checker->process().old_simix_processes()) if (p.address == address) return &p.copy; xbt_die("Issuer not found"); } -smx_process_t MC_smx_resolve_process(smx_process_t process_remote_address) -{ - if (!process_remote_address) - return nullptr; - if (mc_mode == MC_MODE_CLIENT) - return 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; -} - -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."); - for (auto& process_info : mc_model_checker->process().smx_process_infos) - if (process_info.address == process_remote_address) - return &process_info; - for (auto& process_info : mc_model_checker->process().smx_old_process_infos) - if (process_info.address == process_remote_address) - return &process_info; - xbt_die("Process info not found"); -} - const char* MC_smx_process_get_host_name(smx_process_t p) { if (mc_mode == MC_MODE_CLIENT) @@ -160,7 +131,7 @@ const char* MC_smx_process_get_host_name(smx_process_t p) simgrid::mc::Process* process = &mc_model_checker->process(); - /* Horrible hack to find the offset of the id in the simgrid::s4u::Host. + /* HACK, Horrible hack to find the offset of the id in the simgrid::s4u::Host. Offsetof is not supported for non-POD types but this should work in pratice for the targets currently supported by the MC @@ -179,7 +150,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: - simgrid::mc::SimixProcessInformation* info = MC_smx_process_get_info(p); + simgrid::mc::SimixProcessInformation* info = process_info_cast(p); simgrid::xbt::string_data remote_string; auto remote_string_address = remote( (simgrid::xbt::string_data*) ((char*) p->host + offset)); @@ -198,12 +169,9 @@ const char* MC_smx_process_get_name(smx_process_t p) if (!p->name) return nullptr; - simgrid::mc::SimixProcessInformation* info = MC_smx_process_get_info(p); - if (info->name.empty()) { - char* name = process->read_string(p->name); - info->name = name; - free(name); - } + simgrid::mc::SimixProcessInformation* info = process_info_cast(p); + if (info->name.empty()) + info->name = process->read_string(p->name); return info->name.c_str(); } @@ -226,5 +194,3 @@ unsigned long MC_smx_get_maxpid(void) &maxpid, sizeof(maxpid)); return maxpid; } - -}