X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dc0b836b646303e8a540d20d9e86ecd4049bb372..ceaf8b82812aa8d58495687482fc6d4995119934:/src/mc/mc_request.h diff --git a/src/mc/mc_request.h b/src/mc/mc_request.h index 1f9fc0dc0d..2d78269da1 100644 --- a/src/mc/mc_request.h +++ b/src/mc/mc_request.h @@ -1,5 +1,4 @@ -/* Copyright (c) 2007-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-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. */ @@ -7,12 +6,8 @@ #ifndef SIMGRID_MC_REQUEST_H #define SIMGRID_MC_REQUEST_H -#include - #include "src/simix/smx_private.h" -SG_BEGIN_DECL() - namespace simgrid { namespace mc { @@ -24,27 +19,24 @@ enum class RequestType { XBT_PRIVATE bool request_depend(smx_simcall_t req1, smx_simcall_t req2); -XBT_PRIVATE char* request_to_string(smx_simcall_t req, int value, simgrid::mc::RequestType type); - -/** Check if the given simcall is visible - * - * \return `TRUE` or `FALSE` - */ -XBT_PRIVATE bool request_is_visible(smx_simcall_t req); +XBT_PRIVATE std::string request_to_string(smx_simcall_t req, int value, simgrid::mc::RequestType type); XBT_PRIVATE bool request_is_enabled_by_idx(smx_simcall_t req, unsigned int idx); /** Is the process ready to execute its simcall? * * This is true if the request associated with the process is ready. + * + * Most requests are always enabled but WAIT and WAITANY + * are not always enabled: a WAIT where the communication does not + * have both a source and a destination yet is not enabled + * (unless timeout is enabled in the wait and enabeld in SimGridMC). */ -XBT_PRIVATE bool process_is_enabled(smx_process_t process); +XBT_PRIVATE bool actor_is_enabled(smx_actor_t process); -XBT_PRIVATE char *request_get_dot_output(smx_simcall_t req, int value); +XBT_PRIVATE std::string request_get_dot_output(smx_simcall_t req, int value); } } -SG_END_DECL() - #endif