X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/10ceac5fd14fb0426b5c93bda85676a79b02d0be..ceaf8b82812aa8d58495687482fc6d4995119934:/src/mc/mc_request.cpp?ds=sidebyside diff --git a/src/mc/mc_request.cpp b/src/mc/mc_request.cpp index e2087298af..4c8b4f5b7a 100644 --- a/src/mc/mc_request.cpp +++ b/src/mc/mc_request.cpp @@ -1,20 +1,13 @@ -/* Copyright (c) 2008-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2008-2017. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include -#include -#include -#include -#include - +#include "src/include/mc/mc.h" +#include "src/mc/ModelChecker.hpp" #include "src/mc/mc_request.h" -#include "src/mc/mc_safety.h" -#include "src/mc/mc_private.h" #include "src/mc/mc_smx.h" #include "src/mc/mc_xbt.hpp" @@ -26,14 +19,13 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_request, mc, static char *pointer_to_string(void *pointer); static char *buff_size_to_string(size_t size); -static inline -simgrid::kernel::activity::Comm* MC_get_comm(smx_simcall_t r) +static inline simgrid::kernel::activity::CommImpl* MC_get_comm(smx_simcall_t r) { switch (r->call ) { case SIMCALL_COMM_WAIT: - return static_cast(simcall_comm_wait__get__comm(r)); + return static_cast(simcall_comm_wait__getraw__comm(r)); case SIMCALL_COMM_TEST: - return static_cast(simcall_comm_test__get__comm(r)); + return static_cast(simcall_comm_test__getraw__comm(r)); default: return nullptr; } @@ -67,8 +59,8 @@ bool request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2) // Those are internal requests, we do not need indirection // because those objects are copies: - simgrid::kernel::activity::Comm* synchro1 = MC_get_comm(r1); - simgrid::kernel::activity::Comm* synchro2 = MC_get_comm(r2); + simgrid::kernel::activity::CommImpl* synchro1 = MC_get_comm(r1); + simgrid::kernel::activity::CommImpl* synchro2 = MC_get_comm(r2); if ((r1->call == SIMCALL_COMM_ISEND || r1->call == SIMCALL_COMM_IRECV) && r2->call == SIMCALL_COMM_WAIT) { @@ -142,7 +134,7 @@ bool request_depend(smx_simcall_t r1, smx_simcall_t r2) if (r1->issuer == r2->issuer) return false; - /* Wait with timeout transitions are not considered by the independence theorem, thus we consider them as dependant with all other transitions */ + /* Wait with timeout transitions are not considered by the independence theorem, thus we consider them as dependent with all other transitions */ if ((r1->call == SIMCALL_COMM_WAIT && simcall_comm_wait__get__timeout(r1) > 0) || (r2->call == SIMCALL_COMM_WAIT && simcall_comm_wait__get__timeout(r2) > 0)) @@ -154,8 +146,8 @@ bool request_depend(smx_simcall_t r1, smx_simcall_t r2) // Those are internal requests, we do not need indirection // because those objects are copies: - simgrid::kernel::activity::Comm* synchro1 = MC_get_comm(r1); - simgrid::kernel::activity::Comm* synchro2 = MC_get_comm(r2); + simgrid::kernel::activity::CommImpl* synchro1 = MC_get_comm(r1); + simgrid::kernel::activity::CommImpl* synchro2 = MC_get_comm(r2); switch(r1->call) { case SIMCALL_COMM_ISEND: @@ -232,15 +224,10 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid char* p = pointer_to_string(simcall_comm_isend__get__src_buff(req)); char* bs = buff_size_to_string(simcall_comm_isend__get__src_buff_size(req)); if (issuer->host) - args = - bprintf("src=(%lu)%s (%s), buff=%s, size=%s", issuer->pid, - MC_smx_process_get_host_name(issuer), - MC_smx_process_get_name(issuer), - p, bs); + args = bprintf("src=(%lu)%s (%s), buff=%s, size=%s", issuer->pid, MC_smx_actor_get_host_name(issuer), + MC_smx_actor_get_name(issuer), p, bs); else - args = - bprintf("src=(%lu)%s, buff=%s, size=%s", issuer->pid, - MC_smx_process_get_name(issuer), p, bs); + args = bprintf("src=(%lu)%s, buff=%s, size=%s", issuer->pid, MC_smx_actor_get_name(issuer), p, bs); xbt_free(bs); xbt_free(p); break; @@ -259,24 +246,18 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid char* p = pointer_to_string(simcall_comm_irecv__get__dst_buff(req)); char* bs = buff_size_to_string(size); if (issuer->host) - args = - bprintf("dst=(%lu)%s (%s), buff=%s, size=%s", issuer->pid, - MC_smx_process_get_host_name(issuer), - MC_smx_process_get_name(issuer), - p, bs); + args = bprintf("dst=(%lu)%s (%s), buff=%s, size=%s", issuer->pid, MC_smx_actor_get_host_name(issuer), + MC_smx_actor_get_name(issuer), p, bs); else - args = - bprintf("dst=(%lu)%s, buff=%s, size=%s", issuer->pid, - MC_smx_process_get_name(issuer), - p, bs); + args = bprintf("dst=(%lu)%s, buff=%s, size=%s", issuer->pid, MC_smx_actor_get_name(issuer), p, bs); xbt_free(bs); xbt_free(p); break; } case SIMCALL_COMM_WAIT: { - simgrid::kernel::activity::Comm* remote_act = - static_cast(simcall_comm_wait__get__comm(req)); + simgrid::kernel::activity::CommImpl* remote_act = + static_cast(simcall_comm_wait__getraw__comm(req)); char* p; if (value == -1) { type = "WaitTimeout"; @@ -286,39 +267,35 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid type = "Wait"; p = pointer_to_string(remote_act); - simgrid::mc::Remote temp_synchro; - simgrid::kernel::activity::Comm* act; + simgrid::mc::Remote temp_synchro; + simgrid::kernel::activity::CommImpl* act; if (use_remote_comm) { - mc_model_checker->process().read(temp_synchro, remote( - static_cast(remote_act))); + mc_model_checker->process().read(temp_synchro, + remote(static_cast(remote_act))); act = temp_synchro.getBuffer(); } else act = remote_act; - smx_actor_t src_proc = mc_model_checker->process().resolveProcess( - simgrid::mc::remote(act->src_proc)); - smx_actor_t dst_proc = mc_model_checker->process().resolveProcess( - simgrid::mc::remote(act->dst_proc)); - args = bprintf("comm=%s [(%lu)%s (%s)-> (%lu)%s (%s)]", p, - src_proc ? src_proc->pid : 0, - src_proc ? MC_smx_process_get_host_name(src_proc) : "", - src_proc ? MC_smx_process_get_name(src_proc) : "", - dst_proc ? dst_proc->pid : 0, - dst_proc ? MC_smx_process_get_host_name(dst_proc) : "", - dst_proc ? MC_smx_process_get_name(dst_proc) : ""); + smx_actor_t src_proc = mc_model_checker->process().resolveActor(simgrid::mc::remote(act->src_proc)); + smx_actor_t dst_proc = mc_model_checker->process().resolveActor(simgrid::mc::remote(act->dst_proc)); + args = + bprintf("comm=%s [(%lu)%s (%s)-> (%lu)%s (%s)]", p, src_proc ? src_proc->pid : 0, + src_proc ? MC_smx_actor_get_host_name(src_proc) : "", src_proc ? MC_smx_actor_get_name(src_proc) : "", + dst_proc ? dst_proc->pid : 0, dst_proc ? MC_smx_actor_get_host_name(dst_proc) : "", + dst_proc ? MC_smx_actor_get_name(dst_proc) : ""); } xbt_free(p); break; } case SIMCALL_COMM_TEST: { - simgrid::kernel::activity::Comm* remote_act = static_cast( - simcall_comm_test__get__comm(req)); - simgrid::mc::Remote temp_synchro; - simgrid::kernel::activity::Comm* act; + simgrid::kernel::activity::CommImpl* remote_act = + static_cast(simcall_comm_test__getraw__comm(req)); + simgrid::mc::Remote temp_synchro; + simgrid::kernel::activity::CommImpl* act; if (use_remote_comm) { - mc_model_checker->process().read(temp_synchro, remote( - static_cast(remote_act))); + mc_model_checker->process().read(temp_synchro, + remote(static_cast(remote_act))); act = temp_synchro.getBuffer(); } else act = remote_act; @@ -332,17 +309,11 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid type = "Test TRUE"; p = pointer_to_string(remote_act); - smx_actor_t src_proc = mc_model_checker->process().resolveProcess( - simgrid::mc::remote(act->src_proc)); - smx_actor_t dst_proc = mc_model_checker->process().resolveProcess( - simgrid::mc::remote(act->dst_proc)); - args = bprintf("comm=%s [(%lu)%s (%s) -> (%lu)%s (%s)]", p, - src_proc->pid, - MC_smx_process_get_name(src_proc), - MC_smx_process_get_host_name(src_proc), - dst_proc->pid, - MC_smx_process_get_name(dst_proc), - MC_smx_process_get_host_name(dst_proc)); + smx_actor_t src_proc = mc_model_checker->process().resolveActor(simgrid::mc::remote(act->src_proc)); + smx_actor_t dst_proc = mc_model_checker->process().resolveActor(simgrid::mc::remote(act->dst_proc)); + args = bprintf("comm=%s [(%lu)%s (%s) -> (%lu)%s (%s)]", p, src_proc->pid, MC_smx_actor_get_name(src_proc), + MC_smx_actor_get_host_name(src_proc), dst_proc->pid, MC_smx_actor_get_name(dst_proc), + MC_smx_actor_get_host_name(dst_proc)); } xbt_free(p); break; @@ -353,12 +324,12 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid s_xbt_dynar_t comms; mc_model_checker->process().read_bytes( &comms, sizeof(comms), remote(simcall_comm_waitany__get__comms(req))); - if (!xbt_dynar_is_empty(&comms)) { + if (not xbt_dynar_is_empty(&comms)) { smx_activity_t remote_sync; read_element(mc_model_checker->process(), &remote_sync, remote(simcall_comm_waitany__get__comms(req)), value, sizeof(remote_sync)); - char* p = pointer_to_string(remote_sync); + char* p = pointer_to_string(&*remote_sync); args = bprintf("comm=%s (%d of %lu)", p, value + 1, xbt_dynar_length(&comms)); xbt_free(p); @@ -386,7 +357,7 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid else type = "Mutex TRYLOCK"; - simgrid::mc::Remote mutex; + simgrid::mc::Remote mutex; mc_model_checker->process().read_bytes(mutex.getBuffer(), sizeof(mutex), remote( req->call == SIMCALL_MUTEX_LOCK @@ -397,11 +368,12 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid mc_model_checker->process().read_bytes(&mutex_sleeping, sizeof(mutex_sleeping), remote(mutex.getBuffer()->sleeping)); - args = bprintf("locked = %d, owner = %d, sleeping = %d", - mutex.getBuffer()->locked, - mutex.getBuffer()->owner != nullptr ? (int) mc_model_checker->process().resolveProcess( - simgrid::mc::remote(mutex.getBuffer()->owner))->pid : -1, - mutex_sleeping.count); + args = + bprintf("locked = %d, owner = %d, sleeping = %d", mutex.getBuffer()->locked, + mutex.getBuffer()->owner != nullptr + ? (int)mc_model_checker->process().resolveActor(simgrid::mc::remote(mutex.getBuffer()->owner))->pid + : -1, + mutex_sleeping.count); break; } @@ -411,20 +383,18 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid break; default: - THROW_UNIMPLEMENTED; + type = SIMIX_simcall_name(req->call); + args = bprintf("??"); + break; } std::string str; if (args != nullptr) - str = simgrid::xbt::string_printf("[(%lu)%s (%s)] %s(%s)", issuer->pid, - MC_smx_process_get_host_name(issuer), - MC_smx_process_get_name(issuer), - type, args); + str = simgrid::xbt::string_printf("[(%lu)%s (%s)] %s(%s)", issuer->pid, MC_smx_actor_get_host_name(issuer), + MC_smx_actor_get_name(issuer), type, args); else - str = simgrid::xbt::string_printf("[(%lu)%s (%s)] %s ", issuer->pid, - MC_smx_process_get_host_name(issuer), - MC_smx_process_get_name(issuer), - type); + str = simgrid::xbt::string_printf("[(%lu)%s (%s)] %s ", issuer->pid, MC_smx_actor_get_host_name(issuer), + MC_smx_actor_get_name(issuer), type); xbt_free(args); return str; } @@ -434,41 +404,169 @@ namespace mc { bool request_is_enabled_by_idx(smx_simcall_t req, unsigned int idx) { - smx_activity_t remote_act = nullptr; + simgrid::kernel::activity::ActivityImpl* remote_act = nullptr; switch (req->call) { case SIMCALL_COMM_WAIT: /* FIXME: check also that src and dst processes are not suspended */ - remote_act = simcall_comm_wait__get__comm(req); + remote_act = simcall_comm_wait__getraw__comm(req); break; case SIMCALL_COMM_WAITANY: { - read_element( - mc_model_checker->process(), &remote_act, - remote(simcall_comm_waitany__get__comms(req)), - idx, sizeof(remote_act)); + read_element(mc_model_checker->process(), &remote_act, remote(simcall_comm_waitany__getraw__comms(req)), idx, + sizeof(remote_act)); } break; case SIMCALL_COMM_TESTANY: - remote_act = mc_model_checker->process().read(remote( - simcall_comm_testany__get__comms(req) + idx)); + remote_act = mc_model_checker->process().read(remote(simcall_comm_testany__getraw__comms(req) + idx)); break; default: return true; } - simgrid::mc::Remote temp_comm; - mc_model_checker->process().read(temp_comm, remote( - static_cast(remote_act))); - simgrid::kernel::activity::Comm* comm = temp_comm.getBuffer(); + simgrid::mc::Remote temp_comm; + mc_model_checker->process().read(temp_comm, remote(static_cast(remote_act))); + simgrid::kernel::activity::CommImpl* comm = temp_comm.getBuffer(); return comm->src_proc && comm->dst_proc; } -bool process_is_enabled(smx_actor_t process) +/** @brief returns if there this transition can proceed in a finite amount of time + * + * It is used in the model-checker to not get into self-deadlock where it would execute a never ending transition. + * + * Only WAIT operations (on comm, on mutex, etc) can ever return false because they could lock the MC exploration. + * Wait operations are OK and return true in only two situations: + * - if the wait will succeed immediately (if both peer of the comm are there already or if the mutex is available) + * - if a timeout is provided, because we can fire the timeout if the transition is not ready without blocking in this + * transition for ever. + * + */ +// Called from both MCer and MCed: +bool actor_is_enabled(smx_actor_t actor) { - return simgrid::mc::request_is_enabled(&process->simcall); + smx_simcall_t req = &actor->simcall; + // TODO, add support for the subtypes? + + switch (req->call) { + case SIMCALL_NONE: + return false; + + case SIMCALL_COMM_WAIT: { + /* FIXME: check also that src and dst processes are not suspended */ + simgrid::kernel::activity::CommImpl* act = + static_cast(simcall_comm_wait__getraw__comm(req)); + +#if SIMGRID_HAVE_MC + // Fetch from MCed memory: + // HACK, type puning + if (mc_model_checker != nullptr) { + simgrid::mc::Remote temp_comm; + mc_model_checker->process().read(temp_comm, remote(act)); + act = static_cast(temp_comm.getBuffer()); + } +#endif + + if (act->src_timeout || act->dst_timeout) { + /* If it has a timeout it will be always be enabled (regardless of who declared the timeout), + * because even if the communication is not ready, it can timeout and won't block. */ + if (_sg_mc_timeout == 1) + return true; + } + /* On the other hand if it hasn't a timeout, check if the comm is ready.*/ + else if (act->detached && act->src_proc == nullptr && act->type == SIMIX_COMM_READY) + return (act->dst_proc != nullptr); + return (act->src_proc && act->dst_proc); + } + + case SIMCALL_COMM_WAITANY: { + xbt_dynar_t comms; + simgrid::kernel::activity::CommImpl* act = + static_cast(simcall_comm_wait__getraw__comm(req)); + +#if SIMGRID_HAVE_MC + s_xbt_dynar_t comms_buffer; + size_t buffer_size = 0; + if (mc_model_checker != nullptr) { + // Read dynar: + mc_model_checker->process().read(&comms_buffer, remote(simcall_comm_waitany__get__comms(req))); + assert(comms_buffer.elmsize == sizeof(act)); + buffer_size = comms_buffer.elmsize * comms_buffer.used; + comms = &comms_buffer; + } else + comms = simcall_comm_waitany__get__comms(req); + + // Read all the dynar buffer: + char buffer[buffer_size]; + if (mc_model_checker != nullptr) + mc_model_checker->process().read_bytes(buffer, sizeof(buffer), remote(comms->data)); +#else + comms = simcall_comm_waitany__get__comms(req); +#endif + + for (unsigned int index = 0; index < comms->used; ++index) { +#if SIMGRID_HAVE_MC + // Fetch act from MCed memory: + // HACK, type puning + simgrid::mc::Remote temp_comm; + if (mc_model_checker != nullptr) { + memcpy(&act, buffer + comms->elmsize * index, sizeof(act)); + mc_model_checker->process().read(temp_comm, remote(act)); + act = static_cast(temp_comm.getBuffer()); + } else +#endif + act = xbt_dynar_get_as(comms, index, simgrid::kernel::activity::CommImpl*); + if (act->src_proc && act->dst_proc) + return true; + } + return false; + } + + case SIMCALL_MUTEX_LOCK: { + smx_mutex_t mutex = simcall_mutex_lock__get__mutex(req); +#if SIMGRID_HAVE_MC + simgrid::mc::Remote temp_mutex; + if (mc_model_checker != nullptr) { + mc_model_checker->process().read(temp_mutex.getBuffer(), remote(mutex)); + mutex = temp_mutex.getBuffer(); + } +#endif + + if (mutex->owner == nullptr) + return true; +#if SIMGRID_HAVE_MC + else if (mc_model_checker != nullptr) { + simgrid::mc::RemoteClient& modelchecked = mc_model_checker->process(); + // TODO, *(mutex->owner) :/ + return modelchecked.resolveActor(simgrid::mc::remote(mutex->owner))->pid == + modelchecked.resolveActor(simgrid::mc::remote(req->issuer))->pid; + } +#endif + else + return mutex->owner->pid == req->issuer->pid; + } + + case SIMCALL_SEM_ACQUIRE: { + static int warned = 0; + if (not warned) + XBT_INFO("Using semaphore in model-checked code is still experimental. Use at your own risk"); + warned = 1; + return true; + } + + case SIMCALL_COND_WAIT: { + static int warned = 0; + if (not warned) + XBT_INFO("Using condition variables in model-checked code is still experimental. Use at your own risk"); + warned = 1; + return true; + } + + default: + /* The rest of the requests are always enabled */ + return true; + } } static const char* colors[] = { @@ -501,16 +599,14 @@ std::string request_get_dot_output(smx_simcall_t req, int value) switch (req->call) { case SIMCALL_COMM_ISEND: if (issuer->host) - label = simgrid::xbt::string_printf("[(%lu)%s] iSend", issuer->pid, - MC_smx_process_get_host_name(issuer)); + label = simgrid::xbt::string_printf("[(%lu)%s] iSend", issuer->pid, MC_smx_actor_get_host_name(issuer)); else label = bprintf("[(%lu)] iSend", issuer->pid); break; case SIMCALL_COMM_IRECV: if (issuer->host) - label = simgrid::xbt::string_printf("[(%lu)%s] iRecv", issuer->pid, - MC_smx_process_get_host_name(issuer)); + label = simgrid::xbt::string_printf("[(%lu)%s] iRecv", issuer->pid, MC_smx_actor_get_host_name(issuer)); else label = simgrid::xbt::string_printf("[(%lu)] iRecv", issuer->pid); break; @@ -518,27 +614,22 @@ std::string request_get_dot_output(smx_simcall_t req, int value) case SIMCALL_COMM_WAIT: { if (value == -1) { if (issuer->host) - label = simgrid::xbt::string_printf("[(%lu)%s] WaitTimeout", issuer->pid, - MC_smx_process_get_host_name(issuer)); + label = simgrid::xbt::string_printf("[(%lu)%s] WaitTimeout", issuer->pid, MC_smx_actor_get_host_name(issuer)); else label = simgrid::xbt::string_printf("[(%lu)] WaitTimeout", issuer->pid); } else { - smx_activity_t remote_act = simcall_comm_wait__get__comm(req); - simgrid::mc::Remote temp_comm; - mc_model_checker->process().read(temp_comm, remote( - static_cast(remote_act))); - simgrid::kernel::activity::Comm* comm = temp_comm.getBuffer(); - - smx_actor_t src_proc = mc_model_checker->process().resolveProcess( - simgrid::mc::remote(comm->src_proc)); - smx_actor_t dst_proc = mc_model_checker->process().resolveProcess( - simgrid::mc::remote(comm->dst_proc)); + simgrid::kernel::activity::ActivityImpl* remote_act = simcall_comm_wait__getraw__comm(req); + simgrid::mc::Remote temp_comm; + mc_model_checker->process().read(temp_comm, + remote(static_cast(remote_act))); + simgrid::kernel::activity::CommImpl* comm = temp_comm.getBuffer(); + + smx_actor_t src_proc = mc_model_checker->process().resolveActor(simgrid::mc::remote(comm->src_proc)); + smx_actor_t dst_proc = mc_model_checker->process().resolveActor(simgrid::mc::remote(comm->dst_proc)); if (issuer->host) - label = simgrid::xbt::string_printf("[(%lu)%s] Wait [(%lu)->(%lu)]", - issuer->pid, - MC_smx_process_get_host_name(issuer), - src_proc ? src_proc->pid : 0, - dst_proc ? dst_proc->pid : 0); + label = simgrid::xbt::string_printf("[(%lu)%s] Wait [(%lu)->(%lu)]", issuer->pid, + MC_smx_actor_get_host_name(issuer), src_proc ? src_proc->pid : 0, + dst_proc ? dst_proc->pid : 0); else label = simgrid::xbt::string_printf("[(%lu)] Wait [(%lu)->(%lu)]", issuer->pid, @@ -549,22 +640,18 @@ std::string request_get_dot_output(smx_simcall_t req, int value) } case SIMCALL_COMM_TEST: { - smx_activity_t remote_act = simcall_comm_test__get__comm(req); - simgrid::mc::Remote temp_comm; - mc_model_checker->process().read(temp_comm, remote( - static_cast(remote_act))); - simgrid::kernel::activity::Comm* comm = temp_comm.getBuffer(); + simgrid::kernel::activity::ActivityImpl* remote_act = simcall_comm_test__getraw__comm(req); + simgrid::mc::Remote temp_comm; + mc_model_checker->process().read(temp_comm, remote(static_cast(remote_act))); + simgrid::kernel::activity::CommImpl* comm = temp_comm.getBuffer(); if (comm->src_proc == nullptr || comm->dst_proc == nullptr) { if (issuer->host) - label = simgrid::xbt::string_printf("[(%lu)%s] Test FALSE", - issuer->pid, - MC_smx_process_get_host_name(issuer)); + label = simgrid::xbt::string_printf("[(%lu)%s] Test FALSE", issuer->pid, MC_smx_actor_get_host_name(issuer)); else label = bprintf("[(%lu)] Test FALSE", issuer->pid); } else { if (issuer->host) - label = simgrid::xbt::string_printf("[(%lu)%s] Test TRUE", issuer->pid, - MC_smx_process_get_host_name(issuer)); + label = simgrid::xbt::string_printf("[(%lu)%s] Test TRUE", issuer->pid, MC_smx_actor_get_host_name(issuer)); else label = simgrid::xbt::string_printf("[(%lu)] Test TRUE", issuer->pid); } @@ -575,10 +662,8 @@ std::string request_get_dot_output(smx_simcall_t req, int value) unsigned long comms_size = read_length( mc_model_checker->process(), remote(simcall_comm_waitany__get__comms(req))); if (issuer->host) - label = simgrid::xbt::string_printf("[(%lu)%s] WaitAny [%d of %lu]", - issuer->pid, - MC_smx_process_get_host_name(issuer), value + 1, - comms_size); + label = simgrid::xbt::string_printf("[(%lu)%s] WaitAny [%d of %lu]", issuer->pid, + MC_smx_actor_get_host_name(issuer), value + 1, comms_size); else label = simgrid::xbt::string_printf("[(%lu)] WaitAny [%d of %lu]", issuer->pid, value + 1, comms_size); @@ -588,16 +673,14 @@ std::string request_get_dot_output(smx_simcall_t req, int value) case SIMCALL_COMM_TESTANY: if (value == -1) { if (issuer->host) - label = simgrid::xbt::string_printf("[(%lu)%s] TestAny FALSE", - issuer->pid, MC_smx_process_get_host_name(issuer)); + label = simgrid::xbt::string_printf("[(%lu)%s] TestAny FALSE", issuer->pid, MC_smx_actor_get_host_name(issuer)); else label = simgrid::xbt::string_printf("[(%lu)] TestAny FALSE", issuer->pid); } else { if (issuer->host) - label = simgrid::xbt::string_printf("[(%lu)%s] TestAny TRUE [%d of %lu]", - issuer->pid, - MC_smx_process_get_host_name(issuer), value + 1, - simcall_comm_testany__get__count(req)); + label = simgrid::xbt::string_printf("[(%lu)%s] TestAny TRUE [%d of %lu]", issuer->pid, + MC_smx_actor_get_host_name(issuer), value + 1, + simcall_comm_testany__get__count(req)); else label = simgrid::xbt::string_printf("[(%lu)] TestAny TRUE [%d of %lu]", issuer->pid, @@ -616,8 +699,8 @@ std::string request_get_dot_output(smx_simcall_t req, int value) case SIMCALL_MC_RANDOM: if (issuer->host) - label = simgrid::xbt::string_printf("[(%lu)%s] MC_RANDOM (%d)", - issuer->pid, MC_smx_process_get_host_name(issuer), value); + label = simgrid::xbt::string_printf("[(%lu)%s] MC_RANDOM (%d)", issuer->pid, MC_smx_actor_get_host_name(issuer), + value); else label = simgrid::xbt::string_printf("[(%lu)] MC_RANDOM (%d)", issuer->pid, value); break;