X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/98aaf6c28dde5365ca65b9b18182042f45867e70..dc0b836b646303e8a540d20d9e86ecd4049bb372:/src/mc/mc_request.cpp diff --git a/src/mc/mc_request.cpp b/src/mc/mc_request.cpp index f85fad264f..0c2acf8651 100644 --- a/src/mc/mc_request.cpp +++ b/src/mc/mc_request.cpp @@ -24,6 +24,8 @@ 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); @@ -53,15 +55,18 @@ smx_mailbox_t MC_get_rdv(smx_simcall_t r) } } +namespace simgrid { +namespace mc { + // Does half the job static inline -int MC_request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2) +bool request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2) { if (r1->call == SIMCALL_COMM_ISEND && r2->call == SIMCALL_COMM_IRECV) - return FALSE; + return false; if (r1->call == SIMCALL_COMM_IRECV && r2->call == SIMCALL_COMM_ISEND) - return FALSE; + return false; // Those are internal requests, we do not need indirection // because those objects are copies: @@ -75,25 +80,25 @@ int MC_request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2) if (rdv != synchro2->comm.rdv_cpy && simcall_comm_wait__get__timeout(r2) <= 0) - return FALSE; + return false; if ((r1->issuer != synchro2->comm.src_proc) && (r1->issuer != synchro2->comm.dst_proc) && simcall_comm_wait__get__timeout(r2) <= 0) - return FALSE; + return false; if ((r1->call == SIMCALL_COMM_ISEND) && (synchro2->comm.type == SIMIX_COMM_SEND) && (synchro2->comm.src_buff != simcall_comm_isend__get__src_buff(r1)) && simcall_comm_wait__get__timeout(r2) <= 0) - return FALSE; + 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)) && simcall_comm_wait__get__timeout(r2) <= 0) - return FALSE; + return false; } /* FIXME: the following rule assumes that the result of the @@ -106,18 +111,18 @@ int MC_request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2) 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)) - return FALSE; + 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)) - return FALSE; + 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) - return FALSE; + return false; if (r1->call == SIMCALL_COMM_WAIT && r2->call == SIMCALL_COMM_TEST && synchro1->comm.src_buff != nullptr @@ -127,19 +132,19 @@ int MC_request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2) && synchro1->comm.dst_buff != synchro2->comm.src_buff && synchro1->comm.dst_buff != synchro2->comm.dst_buff && synchro2->comm.dst_buff != synchro1->comm.src_buff) - return FALSE; + return false; - return TRUE; + return true; } // Those are MC_state_get_internal_request(state) -int MC_request_depend(smx_simcall_t r1, smx_simcall_t r2) +bool request_depend(smx_simcall_t r1, smx_simcall_t r2) { if (mc_reduce_kind == e_mc_reduce_none) - return TRUE; + return true; if (r1->issuer == r2->issuer) - return FALSE; + return false; /* Wait with timeout transitions are not considered by the independance theorem, thus we consider them as dependant with all other transitions */ if ((r1->call == SIMCALL_COMM_WAIT && simcall_comm_wait__get__timeout(r1) > 0) @@ -148,8 +153,8 @@ int MC_request_depend(smx_simcall_t r1, smx_simcall_t r2) return TRUE; if (r1->call != r2->call) - return MC_request_depend_asymmetric(r1, r2) - && MC_request_depend_asymmetric(r2, r1); + return request_depend_asymmetric(r1, r2) + && request_depend_asymmetric(r2, r1); // Those are internal requests, we do not need indirection // because those objects are copies: @@ -164,7 +169,7 @@ int MC_request_depend(smx_simcall_t r1, smx_simcall_t r2) case SIMCALL_COMM_WAIT: if (synchro1->comm.src_buff == synchro2->comm.src_buff && synchro1->comm.dst_buff == synchro2->comm.dst_buff) - return FALSE; + return false; else if (synchro1->comm.src_buff != nullptr && synchro1->comm.dst_buff != nullptr && synchro2->comm.src_buff != nullptr @@ -172,14 +177,17 @@ int MC_request_depend(smx_simcall_t r1, smx_simcall_t r2) && synchro1->comm.dst_buff != synchro2->comm.src_buff && synchro1->comm.dst_buff != synchro2->comm.dst_buff && synchro2->comm.dst_buff != synchro1->comm.src_buff) - return FALSE; + return false; else - return TRUE; + return true; default: - return TRUE; + return true; } } +} +} + static char *pointer_to_string(void *pointer) { @@ -199,15 +207,15 @@ static char *buff_size_to_string(size_t buff_size) } -char *MC_request_to_string(smx_simcall_t req, int value, e_mc_request_type_t request_type) +char *simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid::mc::RequestType request_type) { bool use_remote_comm = true; switch(request_type) { - case MC_REQUEST_SIMIX: + case simgrid::mc::RequestType::simix: use_remote_comm = true; break; - case MC_REQUEST_EXECUTED: - case MC_REQUEST_INTERNAL: + case simgrid::mc::RequestType::executed: + case simgrid::mc::RequestType::internal: use_remote_comm = false; break; } @@ -427,44 +435,10 @@ char *MC_request_to_string(smx_simcall_t req, int value, e_mc_request_type_t req return str; } -unsigned int MC_request_testany_fail(smx_simcall_t req) -{ - // Remote xbt_dynar_foreach on simcall_comm_testany__get__comms(req). - - // Read the dynar: - s_xbt_dynar_t comms; - mc_model_checker->process().read_bytes( - &comms, sizeof(comms), remote(simcall_comm_testany__get__comms(req))); +namespace simgrid { +namespace mc { - // Read ther dynar buffer: - size_t buffer_size = comms.elmsize * comms.used; - char buffer[buffer_size]; - mc_model_checker->process().read_bytes( - buffer, buffer_size, remote(comms.data)); - - // Iterate over the elements: - assert(comms.elmsize == sizeof(smx_synchro_t)); - unsigned cursor; - for (cursor=0; cursor != comms.used; ++cursor) { - - // Get the element: - smx_synchro_t remote_action = nullptr; - memcpy(&remote_action, buffer + comms.elmsize * cursor, sizeof(remote_action)); - - // Dereference the pointer: - s_smx_synchro_t action; - mc_model_checker->process().read_bytes( - &action, sizeof(action), remote(remote_action)); - - // Finally so something useful about it: - if (action.comm.src_proc && action.comm.dst_proc) - return FALSE; - } - - return TRUE; -} - -int MC_request_is_enabled_by_idx(smx_simcall_t req, unsigned int idx) +bool request_is_enabled_by_idx(smx_simcall_t req, unsigned int idx) { smx_synchro_t remote_act = nullptr; switch (req->call) { @@ -491,7 +465,7 @@ int MC_request_is_enabled_by_idx(smx_simcall_t req, unsigned int idx) break; default: - return TRUE; + return true; } s_smx_synchro_t synchro; @@ -500,12 +474,12 @@ int MC_request_is_enabled_by_idx(smx_simcall_t req, unsigned int idx) return synchro.comm.src_proc && synchro.comm.dst_proc; } -int MC_process_is_enabled(smx_process_t process) +bool process_is_enabled(smx_process_t process) { - return MC_request_is_enabled(&process->simcall); + return simgrid::mc::request_is_enabled(&process->simcall); } -char *MC_request_get_dot_output(smx_simcall_t req, int value) +char *request_get_dot_output(smx_simcall_t req, int value) { char *label = nullptr; @@ -669,3 +643,4 @@ char *MC_request_get_dot_output(smx_simcall_t req, int value) } } +}