X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ceaf8b82812aa8d58495687482fc6d4995119934..705d7f1d9bb048c715a17cd5e726dbdbbd6b6d71:/src/mc/mc_request.cpp diff --git a/src/mc/mc_request.cpp b/src/mc/mc_request.cpp index 4c8b4f5b7a..de861f45ce 100644 --- a/src/mc/mc_request.cpp +++ b/src/mc/mc_request.cpp @@ -6,9 +6,10 @@ #include #include "src/include/mc/mc.h" +#include "src/kernel/activity/MutexImpl.hpp" #include "src/mc/ModelChecker.hpp" -#include "src/mc/mc_request.h" -#include "src/mc/mc_smx.h" +#include "src/mc/mc_request.hpp" +#include "src/mc/mc_smx.hpp" #include "src/mc/mc_xbt.hpp" using simgrid::mc::remote; @@ -160,16 +161,11 @@ bool request_depend(smx_simcall_t r1, smx_simcall_t r2) if (synchro1->src_buff == synchro2->src_buff && synchro1->dst_buff == synchro2->dst_buff) return false; - else 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) + 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; } @@ -199,7 +195,7 @@ static char *buff_size_to_string(size_t buff_size) std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid::mc::RequestType request_type) { - xbt_assert(mc_model_checker != nullptr); + xbt_assert(mc_model_checker != nullptr, "Must be called from MCer"); bool use_remote_comm = true; switch(request_type) { @@ -210,6 +206,8 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid case simgrid::mc::RequestType::internal: use_remote_comm = false; break; + default: + THROW_IMPOSSIBLE; } const char* type = nullptr; @@ -235,8 +233,6 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid 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), @@ -329,7 +325,7 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid 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); @@ -357,23 +353,18 @@ 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 ? 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.getBuffer()->sleeping)); - args = - bprintf("locked = %d, owner = %d, sleeping = %d", mutex.getBuffer()->locked, + 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, - mutex_sleeping.count); + : -1); break; } @@ -412,10 +403,9 @@ bool request_is_enabled_by_idx(smx_simcall_t req, unsigned int idx) remote_act = simcall_comm_wait__getraw__comm(req); break; - case SIMCALL_COMM_WAITANY: { + 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: @@ -432,142 +422,6 @@ bool request_is_enabled_by_idx(smx_simcall_t req, unsigned int idx) return comm->src_proc && comm->dst_proc; } -/** @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) -{ - 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[] = { "blue", @@ -611,7 +465,7 @@ std::string request_get_dot_output(smx_simcall_t req, int value) 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 = simgrid::xbt::string_printf("[(%lu)%s] WaitTimeout", issuer->pid, MC_smx_actor_get_host_name(issuer)); @@ -637,7 +491,6 @@ std::string request_get_dot_output(smx_simcall_t req, int value) dst_proc ? dst_proc->pid : 0); } break; - } case SIMCALL_COMM_TEST: { simgrid::kernel::activity::ActivityImpl* remote_act = simcall_comm_test__getraw__comm(req);