X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/70dac1ca76af656b8117b346476c950c7790a94b..ecd5f7562caf1d443bf22788fa5f4fac408776ec:/src/mc/remote/RemoteClient.cpp?ds=sidebyside diff --git a/src/mc/remote/RemoteClient.cpp b/src/mc/remote/RemoteClient.cpp index 4f87d9a192..0172d7064e 100644 --- a/src/mc/remote/RemoteClient.cpp +++ b/src/mc/remote/RemoteClient.cpp @@ -415,7 +415,6 @@ std::string RemoteClient::read_string(RemotePtr address) const if (not address) return {}; - // TODO, use std::vector with .data() in C++17 to avoid useless copies std::vector res(128); off_t off = 0; @@ -586,10 +585,7 @@ void RemoteClient::unignore_heap(void* address, size_t size) while (start <= end) { cursor = (start + end) / 2; auto& region = ignored_heap_[cursor]; - if (region.address == address) { - ignored_heap_.erase(ignored_heap_.begin() + cursor); - return; - } else if (region.address < address) + if (region.address < address) start = cursor + 1; else if ((char*)region.address <= ((char*)address + size)) { ignored_heap_.erase(ignored_heap_.begin() + cursor); @@ -649,17 +645,16 @@ void RemoteClient::dumpStack() _UPT_destroy(context); unw_destroy_addr_space(as); - return; } bool RemoteClient::actor_is_enabled(aid_t pid) { - s_mc_message_actor_enabled msg{MC_MESSAGE_ACTOR_ENABLED, pid}; + s_mc_message_actor_enabled_t msg{MC_MESSAGE_ACTOR_ENABLED, pid}; process()->getChannel().send(msg); char buff[MC_MESSAGE_LENGTH]; ssize_t received = process()->getChannel().receive(buff, MC_MESSAGE_LENGTH, true); - xbt_assert(received == sizeof(s_mc_message_int), "Unexpected size in answer to ACTOR_ENABLED"); - return ((mc_message_int_t*)buff)->value; + xbt_assert(received == sizeof(s_mc_message_int_t), "Unexpected size in answer to ACTOR_ENABLED"); + return ((s_mc_message_int_t*)buff)->value; } } }