X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d656f9465e7b1c36319f86eeafdcec58fe9551a4..29a3b2869c0075fc75e8ccc66fc1d9c4c8bf6a85:/src/mc/mc_request.cpp diff --git a/src/mc/mc_request.cpp b/src/mc/mc_request.cpp index e4fbdf6892..6bde7b5d6c 100644 --- a/src/mc/mc_request.cpp +++ b/src/mc/mc_request.cpp @@ -1,13 +1,13 @@ -/* Copyright (c) 2008-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-2018. 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 "src/mc/mc_request.hpp" #include "src/include/mc/mc.h" +#include "src/kernel/activity/CommImpl.hpp" +#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" @@ -96,7 +96,7 @@ bool request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2) #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 @@ -138,7 +138,7 @@ bool request_depend(smx_simcall_t r1, smx_simcall_t r2) 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)) - return TRUE; + return true; if (r1->call != r2->call) return request_depend_asymmetric(r1, r2) @@ -160,16 +160,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; } @@ -210,6 +205,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; @@ -223,11 +220,11 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid type = "iSend"; 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_actor_get_host_name(issuer), + if (issuer->host_) + args = bprintf("src=(%ld)%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_actor_get_name(issuer), p, bs); + args = bprintf("src=(%ld)%s, buff=%s, size=%s", issuer->pid_, MC_smx_actor_get_name(issuer), p, bs); xbt_free(bs); xbt_free(p); break; @@ -243,11 +240,11 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid type = "iRecv"; 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_actor_get_host_name(issuer), + if (issuer->host_) + args = bprintf("dst=(%ld)%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_actor_get_name(issuer), p, bs); + args = bprintf("dst=(%ld)%s, buff=%s, size=%s", issuer->pid_, MC_smx_actor_get_name(issuer), p, bs); xbt_free(bs); xbt_free(p); break; @@ -277,9 +274,9 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid 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, + bprintf("comm=%s [(%ld)%s (%s)-> (%ld)%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 ? 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); @@ -309,8 +306,8 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid 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), + args = bprintf("comm=%s [(%ld)%s (%s) -> (%ld)%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); @@ -327,7 +324,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); @@ -355,23 +352,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); + ? (int)mc_model_checker->process().resolveActor(simgrid::mc::remote(mutex.getBuffer()->owner))->pid_ + : -1); break; } @@ -388,10 +380,10 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid std::string str; if (args != nullptr) - str = simgrid::xbt::string_printf("[(%lu)%s (%s)] %s(%s)", issuer->pid, MC_smx_actor_get_host_name(issuer), + str = simgrid::xbt::string_printf("[(%ld)%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_actor_get_host_name(issuer), + str = simgrid::xbt::string_printf("[(%ld)%s (%s)] %s ", issuer->pid_, MC_smx_actor_get_host_name(issuer), MC_smx_actor_get_name(issuer), type); xbt_free(args); return str; @@ -410,10 +402,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: @@ -460,25 +451,25 @@ 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_actor_get_host_name(issuer)); + if (issuer->host_) + label = simgrid::xbt::string_printf("[(%ld)%s] iSend", issuer->pid_, MC_smx_actor_get_host_name(issuer)); else - label = bprintf("[(%lu)] iSend", issuer->pid); + label = bprintf("[(%ld)] iSend", issuer->pid_); break; case SIMCALL_COMM_IRECV: - if (issuer->host) - label = simgrid::xbt::string_printf("[(%lu)%s] iRecv", issuer->pid, MC_smx_actor_get_host_name(issuer)); + if (issuer->host_) + label = simgrid::xbt::string_printf("[(%ld)%s] iRecv", issuer->pid_, MC_smx_actor_get_host_name(issuer)); else - label = simgrid::xbt::string_printf("[(%lu)] iRecv", issuer->pid); + label = simgrid::xbt::string_printf("[(%ld)] 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)); + if (issuer->host_) + label = simgrid::xbt::string_printf("[(%ld)%s] WaitTimeout", issuer->pid_, MC_smx_actor_get_host_name(issuer)); else - label = simgrid::xbt::string_printf("[(%lu)] WaitTimeout", issuer->pid); + label = simgrid::xbt::string_printf("[(%ld)] WaitTimeout", issuer->pid_); } else { simgrid::kernel::activity::ActivityImpl* remote_act = simcall_comm_wait__getraw__comm(req); simgrid::mc::Remote temp_comm; @@ -488,18 +479,15 @@ std::string request_get_dot_output(smx_simcall_t req, int value) 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_actor_get_host_name(issuer), src_proc ? src_proc->pid : 0, - dst_proc ? dst_proc->pid : 0); + if (issuer->host_) + label = simgrid::xbt::string_printf("[(%ld)%s] Wait [(%ld)->(%ld)]", 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, - src_proc ? src_proc->pid : 0, - dst_proc ? dst_proc->pid : 0); + label = simgrid::xbt::string_printf("[(%ld)] Wait [(%ld)->(%ld)]", issuer->pid_, src_proc ? src_proc->pid_ : 0, + dst_proc ? dst_proc->pid_ : 0); } break; - } case SIMCALL_COMM_TEST: { simgrid::kernel::activity::ActivityImpl* remote_act = simcall_comm_test__getraw__comm(req); @@ -507,15 +495,15 @@ std::string request_get_dot_output(smx_simcall_t req, int value) 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_actor_get_host_name(issuer)); + if (issuer->host_) + label = simgrid::xbt::string_printf("[(%ld)%s] Test FALSE", issuer->pid_, MC_smx_actor_get_host_name(issuer)); else - label = bprintf("[(%lu)] Test FALSE", issuer->pid); + label = bprintf("[(%ld)] Test FALSE", issuer->pid_); } else { - if (issuer->host) - label = simgrid::xbt::string_printf("[(%lu)%s] Test TRUE", issuer->pid, MC_smx_actor_get_host_name(issuer)); + if (issuer->host_) + label = simgrid::xbt::string_printf("[(%ld)%s] Test TRUE", issuer->pid_, MC_smx_actor_get_host_name(issuer)); else - label = simgrid::xbt::string_printf("[(%lu)] Test TRUE", issuer->pid); + label = simgrid::xbt::string_printf("[(%ld)] Test TRUE", issuer->pid_); } break; } @@ -523,55 +511,53 @@ std::string request_get_dot_output(smx_simcall_t req, int value) case SIMCALL_COMM_WAITANY: { 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, + if (issuer->host_) + label = simgrid::xbt::string_printf("[(%ld)%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); + label = simgrid::xbt::string_printf("[(%ld)] WaitAny [%d of %lu]", issuer->pid_, value + 1, comms_size); break; } case SIMCALL_COMM_TESTANY: if (value == -1) { - if (issuer->host) - label = simgrid::xbt::string_printf("[(%lu)%s] TestAny FALSE", issuer->pid, MC_smx_actor_get_host_name(issuer)); + if (issuer->host_) + label = + simgrid::xbt::string_printf("[(%ld)%s] TestAny FALSE", issuer->pid_, MC_smx_actor_get_host_name(issuer)); else - label = simgrid::xbt::string_printf("[(%lu)] TestAny FALSE", issuer->pid); + label = simgrid::xbt::string_printf("[(%ld)] TestAny FALSE", issuer->pid_); } else { - if (issuer->host) - label = simgrid::xbt::string_printf("[(%lu)%s] TestAny TRUE [%d of %lu]", issuer->pid, + if (issuer->host_) + label = simgrid::xbt::string_printf("[(%ld)%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, - value + 1, - simcall_comm_testany__get__count(req)); + label = simgrid::xbt::string_printf("[(%ld)] TestAny TRUE [%d of %lu]", issuer->pid_, value + 1, + simcall_comm_testany__get__count(req)); } break; case SIMCALL_MUTEX_TRYLOCK: - label = simgrid::xbt::string_printf("[(%lu)] Mutex TRYLOCK", issuer->pid); + label = simgrid::xbt::string_printf("[(%ld)] Mutex TRYLOCK", issuer->pid_); break; case SIMCALL_MUTEX_LOCK: - label = simgrid::xbt::string_printf("[(%lu)] Mutex LOCK", issuer->pid); + label = simgrid::xbt::string_printf("[(%ld)] Mutex LOCK", issuer->pid_); break; case SIMCALL_MC_RANDOM: - if (issuer->host) - label = simgrid::xbt::string_printf("[(%lu)%s] MC_RANDOM (%d)", issuer->pid, MC_smx_actor_get_host_name(issuer), + if (issuer->host_) + label = simgrid::xbt::string_printf("[(%ld)%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); + label = simgrid::xbt::string_printf("[(%ld)] MC_RANDOM (%d)", issuer->pid_, value); break; default: THROW_UNIMPLEMENTED; } - const char* color = get_color(issuer->pid - 1); + const char* color = get_color(issuer->pid_ - 1); return simgrid::xbt::string_printf( "label = \"%s\", color = %s, fontcolor = %s", label.c_str(), color, color);