X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dc0b836b646303e8a540d20d9e86ecd4049bb372..705d7f1d9bb048c715a17cd5e726dbdbbd6b6d71:/src/mc/mc_request.cpp diff --git a/src/mc/mc_request.cpp b/src/mc/mc_request.cpp index 0c2acf8651..de861f45ce 100644 --- a/src/mc/mc_request.cpp +++ b/src/mc/mc_request.cpp @@ -1,55 +1,45 @@ -/* 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 "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/include/mc/mc.h" +#include "src/kernel/activity/MutexImpl.hpp" +#include "src/mc/ModelChecker.hpp" +#include "src/mc/mc_request.hpp" +#include "src/mc/mc_smx.hpp" #include "src/mc/mc_xbt.hpp" using simgrid::mc::remote; -extern "C" { - XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_request, mc, "Logging specific to MC (request)"); -} - static char *pointer_to_string(void *pointer); static char *buff_size_to_string(size_t size); -static inline -smx_synchro_t 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 simcall_comm_wait__get__comm(r); + return static_cast(simcall_comm_wait__getraw__comm(r)); case SIMCALL_COMM_TEST: - return simcall_comm_test__get__comm(r); + return static_cast(simcall_comm_test__getraw__comm(r)); default: return nullptr; } } static inline -smx_mailbox_t MC_get_rdv(smx_simcall_t r) +smx_mailbox_t MC_get_mbox(smx_simcall_t r) { switch(r->call) { case SIMCALL_COMM_ISEND: - return simcall_comm_isend__get__rdv(r); + return simcall_comm_isend__get__mbox(r); case SIMCALL_COMM_IRECV: - return simcall_comm_irecv__get__rdv(r); + return simcall_comm_irecv__get__mbox(r); default: return nullptr; } @@ -70,33 +60,33 @@ 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: - smx_synchro_t synchro1 = MC_get_comm(r1); - smx_synchro_t 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) { - smx_mailbox_t rdv = MC_get_rdv(r1); + smx_mailbox_t mbox = MC_get_mbox(r1); - if (rdv != synchro2->comm.rdv_cpy + if (mbox != synchro2->mbox_cpy && simcall_comm_wait__get__timeout(r2) <= 0) return false; - if ((r1->issuer != synchro2->comm.src_proc) - && (r1->issuer != synchro2->comm.dst_proc) + if ((r1->issuer != synchro2->src_proc) + && (r1->issuer != synchro2->dst_proc) && simcall_comm_wait__get__timeout(r2) <= 0) return false; if ((r1->call == SIMCALL_COMM_ISEND) - && (synchro2->comm.type == SIMIX_COMM_SEND) - && (synchro2->comm.src_buff != + && (synchro2->type == SIMIX_COMM_SEND) + && (synchro2->src_buff != simcall_comm_isend__get__src_buff(r1)) && simcall_comm_wait__get__timeout(r2) <= 0) return false; if ((r1->call == SIMCALL_COMM_IRECV) - && (synchro2->comm.type == SIMIX_COMM_RECEIVE) - && (synchro2->comm.dst_buff != simcall_comm_irecv__get__dst_buff(r1)) + && (synchro2->type == SIMIX_COMM_RECEIVE) + && (synchro2->dst_buff != simcall_comm_irecv__get__dst_buff(r1)) && simcall_comm_wait__get__timeout(r2) <= 0) return false; } @@ -104,49 +94,48 @@ bool request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2) /* FIXME: the following rule assumes that the result of the * isend/irecv call is not stored in a buffer used in the * test call. */ - /*if( (r1->call == SIMCALL_COMM_ISEND || r1->call == SIMCALL_COMM_IRECV) +#if 0 + if((r1->call == SIMCALL_COMM_ISEND || r1->call == SIMCALL_COMM_IRECV) && r2->call == SIMCALL_COMM_TEST) - return FALSE; */ + return FALSE; +#endif if (r1->call == SIMCALL_COMM_WAIT && (r2->call == SIMCALL_COMM_WAIT || r2->call == SIMCALL_COMM_TEST) - && (synchro1->comm.src_proc == nullptr || synchro1->comm.dst_proc == NULL)) + && (synchro1->src_proc == nullptr || synchro1->dst_proc == nullptr)) return false; if (r1->call == SIMCALL_COMM_TEST && (simcall_comm_test__get__comm(r1) == nullptr - || synchro1->comm.src_buff == nullptr - || synchro1->comm.dst_buff == nullptr)) + || synchro1->src_buff == nullptr + || synchro1->dst_buff == nullptr)) return false; if (r1->call == SIMCALL_COMM_TEST && r2->call == SIMCALL_COMM_WAIT - && synchro1->comm.src_buff == synchro2->comm.src_buff - && synchro1->comm.dst_buff == synchro2->comm.dst_buff) + && synchro1->src_buff == synchro2->src_buff + && synchro1->dst_buff == synchro2->dst_buff) return false; if (r1->call == SIMCALL_COMM_WAIT && r2->call == SIMCALL_COMM_TEST - && synchro1->comm.src_buff != nullptr - && synchro1->comm.dst_buff != nullptr - && synchro2->comm.src_buff != nullptr - && synchro2->comm.dst_buff != nullptr - && synchro1->comm.dst_buff != synchro2->comm.src_buff - && synchro1->comm.dst_buff != synchro2->comm.dst_buff - && synchro2->comm.dst_buff != synchro1->comm.src_buff) + && synchro1->src_buff != nullptr + && synchro1->dst_buff != nullptr + && synchro2->src_buff != nullptr + && synchro2->dst_buff != nullptr + && synchro1->dst_buff != synchro2->src_buff + && synchro1->dst_buff != synchro2->dst_buff + && synchro2->dst_buff != synchro1->src_buff) return false; return true; } -// Those are MC_state_get_internal_request(state) +// Those are internal_req bool request_depend(smx_simcall_t r1, smx_simcall_t r2) { - if (mc_reduce_kind == e_mc_reduce_none) - return true; - if (r1->issuer == r2->issuer) return false; - /* Wait with timeout transitions are not considered by the independance 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)) @@ -158,28 +147,25 @@ 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: - smx_synchro_t synchro1 = MC_get_comm(r1); - smx_synchro_t 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: - return simcall_comm_isend__get__rdv(r1) == simcall_comm_isend__get__rdv(r2); + return simcall_comm_isend__get__mbox(r1) + == simcall_comm_isend__get__mbox(r2); case SIMCALL_COMM_IRECV: - return simcall_comm_irecv__get__rdv(r1) == simcall_comm_irecv__get__rdv(r2); + return simcall_comm_irecv__get__mbox(r1) + == simcall_comm_irecv__get__mbox(r2); case SIMCALL_COMM_WAIT: - if (synchro1->comm.src_buff == synchro2->comm.src_buff - && synchro1->comm.dst_buff == synchro2->comm.dst_buff) + if (synchro1->src_buff == synchro2->src_buff + && synchro1->dst_buff == synchro2->dst_buff) return false; - else if (synchro1->comm.src_buff != nullptr - && synchro1->comm.dst_buff != nullptr - && synchro2->comm.src_buff != nullptr - && synchro2->comm.dst_buff != nullptr - && synchro1->comm.dst_buff != synchro2->comm.src_buff - && synchro1->comm.dst_buff != synchro2->comm.dst_buff - && synchro2->comm.dst_buff != synchro1->comm.src_buff) + if (synchro1->src_buff != nullptr && synchro1->dst_buff != nullptr && synchro2->src_buff != nullptr && + synchro2->dst_buff != nullptr && synchro1->dst_buff != synchro2->src_buff && + synchro1->dst_buff != synchro2->dst_buff && synchro2->dst_buff != synchro1->src_buff) return false; - else - return true; + return true; default: return true; } @@ -207,8 +193,10 @@ static char *buff_size_to_string(size_t buff_size) } -char *simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid::mc::RequestType request_type) +std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid::mc::RequestType request_type) { + xbt_assert(mc_model_checker != nullptr, "Must be called from MCer"); + bool use_remote_comm = true; switch(request_type) { case simgrid::mc::RequestType::simix: @@ -218,12 +206,14 @@ char *simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid::mc:: case simgrid::mc::RequestType::internal: use_remote_comm = false; break; + default: + THROW_IMPOSSIBLE; } const char* type = nullptr; char *args = nullptr; - smx_process_t issuer = MC_smx_simcall_get_issuer(req); + smx_actor_t issuer = MC_smx_simcall_get_issuer(req); switch (req->call) { @@ -232,15 +222,10 @@ char *simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid::mc:: 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; @@ -248,8 +233,6 @@ char *simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid::mc:: case SIMCALL_COMM_IRECV: { size_t* remote_size = simcall_comm_irecv__get__dst_buff_size(req); - - // size_t size = size_pointer ? *size_pointer : 0; size_t size = 0; if (remote_size) mc_model_checker->process().read_bytes(&size, sizeof(size), @@ -259,23 +242,18 @@ char *simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid::mc:: 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: { - smx_synchro_t remote_act = 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"; @@ -285,42 +263,41 @@ char *simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid::mc:: type = "Wait"; p = pointer_to_string(remote_act); - s_smx_synchro_t synchro; - smx_synchro_t act; + simgrid::mc::Remote temp_synchro; + simgrid::kernel::activity::CommImpl* act; if (use_remote_comm) { - mc_model_checker->process().read_bytes(&synchro, - sizeof(synchro), remote(remote_act)); - act = &synchro; + mc_model_checker->process().read(temp_synchro, + remote(static_cast(remote_act))); + act = temp_synchro.getBuffer(); } else act = remote_act; - smx_process_t src_proc = MC_smx_resolve_process(act->comm.src_proc); - smx_process_t dst_proc = MC_smx_resolve_process(act->comm.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: { - smx_synchro_t remote_act = simcall_comm_test__get__comm(req); - s_smx_synchro_t synchro; - smx_synchro_t act; - if (use_remote_comm) { - mc_model_checker->process().read_bytes(&synchro, - sizeof(synchro), remote(remote_act)); - act = &synchro; - } else - act = remote_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))); + act = temp_synchro.getBuffer(); + } else + act = remote_act; char* p; - if (act->comm.src_proc == nullptr || act->comm.dst_proc == NULL) { + if (act->src_proc == nullptr || act->dst_proc == nullptr) { type = "Test FALSE"; p = pointer_to_string(remote_act); args = bprintf("comm=%s", p); @@ -328,15 +305,11 @@ char *simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid::mc:: type = "Test TRUE"; p = pointer_to_string(remote_act); - smx_process_t src_proc = MC_smx_resolve_process(act->comm.src_proc); - smx_process_t dst_proc = MC_smx_resolve_process(act->comm.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; @@ -347,12 +320,12 @@ char *simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid::mc:: 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)) { - smx_synchro_t remote_sync; + 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.get()); args = bprintf("comm=%s (%d of %lu)", p, value + 1, xbt_dynar_length(&comms)); xbt_free(p); @@ -369,8 +342,7 @@ char *simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid::mc:: type = "TestAny"; args = bprintf("(%d of %zu)", value + 1, - read_length(mc_model_checker->process(), - simcall_comm_testany__get__comms(req))); + simcall_comm_testany__get__count(req)); } break; @@ -381,56 +353,39 @@ char *simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid::mc:: else type = "Mutex TRYLOCK"; - s_smx_mutex_t mutex; - mc_model_checker->process().read_bytes(&mutex, sizeof(mutex), + simgrid::mc::Remote mutex; + mc_model_checker->process().read_bytes(mutex.getBuffer(), sizeof(mutex), remote( req->call == SIMCALL_MUTEX_LOCK ? simcall_mutex_lock__get__mutex(req) : simcall_mutex_trylock__get__mutex(req) )); - s_xbt_swag_t mutex_sleeping; - mc_model_checker->process().read_bytes(&mutex_sleeping, sizeof(mutex_sleeping), - remote(mutex.sleeping)); - - args = bprintf("locked = %d, owner = %d, sleeping = %d", - mutex.locked, - mutex.owner != nullptr ? (int) MC_smx_resolve_process(mutex.owner)->pid : -1, - mutex_sleeping.count); + args = + bprintf("locked = %d, owner = %d, sleeping = n/a", mutex.getBuffer()->locked, + mutex.getBuffer()->owner != nullptr + ? (int)mc_model_checker->process().resolveActor(simgrid::mc::remote(mutex.getBuffer()->owner))->pid + : -1); break; } - case SIMCALL_MC_SNAPSHOT: - type = "MC_SNAPSHOT"; - args = nullptr; - break; - - case SIMCALL_MC_COMPARE_SNAPSHOTS: - type = "MC_COMPARE_SNAPSHOTS"; - args = nullptr; - break; - case SIMCALL_MC_RANDOM: type = "MC_RANDOM"; args = bprintf("%d", value); break; default: - THROW_UNIMPLEMENTED; + type = SIMIX_simcall_name(req->call); + args = bprintf("??"); + break; } - char* str; + std::string str; if (args != nullptr) - str = - bprintf("[(%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 = - bprintf("[(%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; } @@ -440,120 +395,118 @@ namespace mc { bool request_is_enabled_by_idx(smx_simcall_t req, unsigned int idx) { - smx_synchro_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)); - } + case SIMCALL_COMM_WAITANY: + read_element(mc_model_checker->process(), &remote_act, remote(simcall_comm_waitany__getraw__comms(req)), idx, + sizeof(remote_act)); break; - case SIMCALL_COMM_TESTANY: { - read_element( - mc_model_checker->process(), &remote_act, - remote(simcall_comm_testany__get__comms(req)), - idx, sizeof(remote_act)); - } + case SIMCALL_COMM_TESTANY: + remote_act = mc_model_checker->process().read(remote(simcall_comm_testany__getraw__comms(req) + idx)); break; default: return true; } - s_smx_synchro_t synchro; - mc_model_checker->process().read_bytes( - &synchro, sizeof(synchro), remote(remote_act)); - return synchro.comm.src_proc && synchro.comm.dst_proc; + 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_process_t process) + +static const char* colors[] = { + "blue", + "red", + "green3", + "goldenrod", + "brown", + "purple", + "magenta", + "turquoise4", + "gray25", + "forestgreen", + "hotpink", + "lightblue", + "tan", +}; + +static inline const char* get_color(int id) { - return simgrid::mc::request_is_enabled(&process->simcall); + return colors[id % (sizeof(colors) / sizeof(colors[0])) ]; } -char *request_get_dot_output(smx_simcall_t req, int value) +std::string request_get_dot_output(smx_simcall_t req, int value) { - char *label = nullptr; + std::string label; - const smx_process_t issuer = MC_smx_simcall_get_issuer(req); + const smx_actor_t issuer = MC_smx_simcall_get_issuer(req); switch (req->call) { case SIMCALL_COMM_ISEND: if (issuer->host) - label = - bprintf("[(%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 = - bprintf("[(%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 = bprintf("[(%lu)] iRecv", issuer->pid); + label = simgrid::xbt::string_printf("[(%lu)] iRecv", issuer->pid); break; - case SIMCALL_COMM_WAIT: { + case SIMCALL_COMM_WAIT: if (value == -1) { if (issuer->host) - label = - bprintf("[(%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 = bprintf("[(%lu)] WaitTimeout", issuer->pid); + label = simgrid::xbt::string_printf("[(%lu)] WaitTimeout", issuer->pid); } else { - smx_synchro_t remote_act = simcall_comm_wait__get__comm(req); - s_smx_synchro_t synchro; - mc_model_checker->process().read_bytes(&synchro, - sizeof(synchro), remote(remote_act)); - - smx_process_t src_proc = MC_smx_resolve_process(synchro.comm.src_proc); - smx_process_t dst_proc = MC_smx_resolve_process(synchro.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 = - bprintf("[(%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 = - bprintf("[(%lu)] Wait [(%lu)->(%lu)]", issuer->pid, + label = simgrid::xbt::string_printf("[(%lu)] Wait [(%lu)->(%lu)]", + issuer->pid, src_proc ? src_proc->pid : 0, dst_proc ? dst_proc->pid : 0); } break; - } case SIMCALL_COMM_TEST: { - smx_synchro_t remote_act = simcall_comm_test__get__comm(req); - s_smx_synchro_t synchro; - mc_model_checker->process().read_bytes(&synchro, - sizeof(synchro), remote(remote_act)); - if (synchro.comm.src_proc == nullptr || synchro.comm.dst_proc == NULL) { + 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 = - bprintf("[(%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 = - bprintf("[(%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 = bprintf("[(%lu)] Test TRUE", issuer->pid); + label = simgrid::xbt::string_printf("[(%lu)] Test TRUE", issuer->pid); } break; } @@ -562,84 +515,57 @@ char *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 = - bprintf("[(%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 = - bprintf("[(%lu)] WaitAny [%d of %lu]", issuer->pid, value + 1, - comms_size); + label = simgrid::xbt::string_printf("[(%lu)] WaitAny [%d of %lu]", + issuer->pid, value + 1, comms_size); break; } case SIMCALL_COMM_TESTANY: if (value == -1) { if (issuer->host) - label = - bprintf("[(%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 = bprintf("[(%lu)] TestAny FALSE", issuer->pid); + label = simgrid::xbt::string_printf("[(%lu)] TestAny FALSE", issuer->pid); } else { if (issuer->host) - label = - bprintf("[(%lu)%s] TestAny TRUE [%d of %lu]", issuer->pid, - MC_smx_process_get_host_name(issuer), value + 1, - xbt_dynar_length(simcall_comm_testany__get__comms(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 = - bprintf("[(%lu)] TestAny TRUE [%d of %lu]", issuer->pid, + label = simgrid::xbt::string_printf("[(%lu)] TestAny TRUE [%d of %lu]", + issuer->pid, value + 1, - xbt_dynar_length(simcall_comm_testany__get__comms(req))); + simcall_comm_testany__get__count(req)); } break; case SIMCALL_MUTEX_TRYLOCK: - label = bprintf("[(%lu)] Mutex TRYLOCK", issuer->pid); + label = simgrid::xbt::string_printf("[(%lu)] Mutex TRYLOCK", issuer->pid); break; case SIMCALL_MUTEX_LOCK: - label = bprintf("[(%lu)] Mutex LOCK", issuer->pid); + label = simgrid::xbt::string_printf("[(%lu)] Mutex LOCK", issuer->pid); break; case SIMCALL_MC_RANDOM: if (issuer->host) - label = - bprintf("[(%lu)%s] MC_RANDOM (%d)", issuer->pid, - MC_smx_process_get_host_name(issuer), value); - else - label = bprintf("[(%lu)] MC_RANDOM (%d)", issuer->pid, value); - break; - - case SIMCALL_MC_SNAPSHOT: - if (issuer->host) - label = - bprintf("[(%lu)%s] MC_SNAPSHOT", issuer->pid, - MC_smx_process_get_host_name(issuer)); + label = simgrid::xbt::string_printf("[(%lu)%s] MC_RANDOM (%d)", issuer->pid, MC_smx_actor_get_host_name(issuer), + value); else - label = bprintf("[(%lu)] MC_SNAPSHOT", issuer->pid); - break; - - case SIMCALL_MC_COMPARE_SNAPSHOTS: - if (issuer->host) - label = - bprintf("[(%lu)%s] MC_COMPARE_SNAPSHOTS", issuer->pid, - MC_smx_process_get_host_name(issuer)); - else - label = bprintf("[(%lu)] MC_COMPARE_SNAPSHOTS", issuer->pid); + label = simgrid::xbt::string_printf("[(%lu)] MC_RANDOM (%d)", issuer->pid, value); break; default: THROW_UNIMPLEMENTED; } - char* str = - bprintf("label = \"%s\", color = %s, fontcolor = %s", label, - colors[issuer->pid - 1], colors[issuer->pid - 1]); - xbt_free(label); - return str; - + const char* color = get_color(issuer->pid - 1); + return simgrid::xbt::string_printf( + "label = \"%s\", color = %s, fontcolor = %s", label.c_str(), + color, color); } }