X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cfc6d44ffc64b24ed6f03f2ecf892c14d8d70918..c8d6bade6ee8fff928228bec67e9b2e86484793d:/src/mc/mc_smx.cpp diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp index f1df2aa566..0c6b8398a1 100644 --- a/src/mc/mc_smx.cpp +++ b/src/mc/mc_smx.cpp @@ -20,7 +20,7 @@ using simgrid::mc::remote; -/** Statically "upcast" a s_smx_process_t into a SimixProcessInformation +/** HACK, 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 @@ -29,9 +29,11 @@ using simgrid::mc::remote; static inline simgrid::mc::SimixProcessInformation* process_info_cast(smx_process_t p) { + simgrid::mc::SimixProcessInformation temp; + std::size_t offset = (char*) temp.copy.getBuffer() - (char*)&temp; + simgrid::mc::SimixProcessInformation* process_info = - (simgrid::mc::SimixProcessInformation*) - ((char*) p - offsetof(simgrid::mc::SimixProcessInformation, copy)); + (simgrid::mc::SimixProcessInformation*) ((char*) p - offset); return process_info; } @@ -43,13 +45,14 @@ simgrid::mc::SimixProcessInformation* process_info_cast(smx_process_t p) */ static void MC_process_refresh_simix_process_list( simgrid::mc::Process* process, - std::vector& target, xbt_swag_t remote_swag) + std::vector& target, + simgrid::mc::RemotePtr remote_swag) { target.clear(); // swag = REMOTE(*simix_global->process_list) s_xbt_swag_t swag; - process->read_bytes(&swag, sizeof(swag), remote(remote_swag)); + process->read_bytes(&swag, sizeof(swag), remote_swag); // Load each element of the vector from the MCed process: int i = 0; @@ -77,19 +80,27 @@ void Process::refresh_simix() // TODO, avoid to reload `&simix_global`, `simix_global`, `*simix_global` - // simix_global_p = REMOTE(simix_global); - smx_global_t simix_global_p; - this->read_variable("simix_global", &simix_global_p, sizeof(simix_global_p)); + static_assert(std::is_same< + std::unique_ptr, + decltype(simix_global) + >::value, "Unexpected type for simix_global"); + static_assert(sizeof(simix_global) == sizeof(simgrid::simix::Global*), + "Bad size for simix_global"); + + // simix_global_p = REMOTE(simix_global.get()); + RemotePtr simix_global_p = + this->read_variable("simix_global"); // simix_global = REMOTE(*simix_global) - s_smx_global_t simix_global; - this->read_bytes(&simix_global, sizeof(simix_global), - remote(simix_global_p)); + Remote simix_global = + this->read(simix_global_p); MC_process_refresh_simix_process_list( - this, this->smx_process_infos, simix_global.process_list); + this, this->smx_process_infos, + remote(simix_global.getBuffer()->process_list)); MC_process_refresh_simix_process_list( - this, this->smx_old_process_infos, simix_global.process_to_destroy); + this, this->smx_old_process_infos, + remote(simix_global.getBuffer()->process_to_destroy)); this->cache_flags_ |= Process::cache_simix_processes; } @@ -108,7 +119,7 @@ void Process::refresh_simix() */ smx_process_t MC_smx_simcall_get_issuer(s_smx_simcall_t const* req) { - xbt_assert(mc_mode == MC_MODE_SERVER); + xbt_assert(mc_model_checker != nullptr); // This is the address of the smx_process in the MCed process: auto address = simgrid::mc::remote(req->issuer); @@ -116,17 +127,17 @@ smx_process_t MC_smx_simcall_get_issuer(s_smx_simcall_t const* req) // Lookup by address: for (auto& p : mc_model_checker->process().simix_processes()) if (p.address == address) - return &p.copy; + return p.copy.getBuffer(); for (auto& p : mc_model_checker->process().old_simix_processes()) if (p.address == address) - return &p.copy; + return p.copy.getBuffer(); xbt_die("Issuer not found"); } const char* MC_smx_process_get_host_name(smx_process_t p) { - if (mc_mode == MC_MODE_CLIENT) + if (mc_model_checker == nullptr) return sg_host_get_name(p->host); simgrid::mc::Process* process = &mc_model_checker->process(); @@ -134,7 +145,7 @@ const char* MC_smx_process_get_host_name(smx_process_t p) /* 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 + work in practice for the targets currently supported by the MC as long as we do not add funny features to the Host class (such as virtual base). @@ -151,10 +162,9 @@ const char* MC_smx_process_get_host_name(smx_process_t p) // Read the simgrid::xbt::string in the MCed process: 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)); - process->read_bytes(&remote_string, sizeof(remote_string), remote_string_address); + simgrid::xbt::string_data remote_string = process->read(remote_string_address); char hostname[remote_string.len]; process->read_bytes(hostname, remote_string.len + 1, remote(remote_string.data)); info->hostname = mc_model_checker->get_host_name(hostname); @@ -164,21 +174,21 @@ const char* MC_smx_process_get_host_name(smx_process_t p) const char* MC_smx_process_get_name(smx_process_t p) { simgrid::mc::Process* process = &mc_model_checker->process(); - if (mc_mode == MC_MODE_CLIENT) - return p->name; - if (!p->name) - return nullptr; + if (mc_model_checker == nullptr) + return p->name.c_str(); simgrid::mc::SimixProcessInformation* info = process_info_cast(p); - if (info->name.empty()) - info->name = process->read_string(p->name); + if (info->name.empty()) { + simgrid::xbt::string_data string_data = (simgrid::xbt::string_data&)p->name; + info->name = process->read_string(remote(string_data.data), string_data.len); + } return info->name.c_str(); } #if HAVE_SMPI int MC_smpi_process_count(void) { - if (mc_mode == MC_MODE_CLIENT) + if (mc_model_checker == nullptr) return smpi_process_count(); int res; mc_model_checker->process().read_variable("process_count",