X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dad398b4437e937d222bafff987814b8f2d80409..ad9d9459261f6f55f69edc333689ad86f2a9f229:/src/mc/mc_base.h

diff --git a/src/mc/mc_base.h b/src/mc/mc_base.h
index fa1fca1b51..9e74d3976f 100644
--- a/src/mc/mc_base.h
+++ b/src/mc/mc_base.h
@@ -7,26 +7,27 @@
 #ifndef SIMGRID_MC_BASE_H
 #define SIMGRID_MC_BASE_H
 
-#include <xbt/misc.h>
-#include <simgrid/simix.h>
-#include "simgrid_config.h"
-#include "src/internal_config.h"
-#include "src/simix/smx_private.h"
-#include "mc/mc.h"
+#ifdef __cplusplus
+#include <vector>
+#endif
 
-SG_BEGIN_DECL()
+#include <xbt/base.h>
 
-/** Check if the given simcall can be resolved
- *
- *  \return `TRUE` or `FALSE`
- */
-XBT_PRIVATE int MC_request_is_enabled(smx_simcall_t req);
+typedef struct s_smx_simcall s_smx_simcall_t, *smx_simcall_t;
 
-/** Check if the given simcall is visible
+#ifdef __cplusplus
+
+namespace simgrid {
+namespace mc {
+
+/** Can this requests can be executed?
  *
- *  \return `TRUE` or `FALSE`
+ *  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 int MC_request_is_visible(smx_simcall_t req);
+XBT_PRIVATE bool request_is_enabled(smx_simcall_t req);
 
 /** Execute everything which is invisible
  *
@@ -34,13 +35,22 @@ XBT_PRIVATE int MC_request_is_visible(smx_simcall_t req);
  *  iteratively until there doesn't remain any. At this point, the function
  *  returns to the caller which can handle the visible (and ready) simcalls.
  */
-XBT_PRIVATE void MC_wait_for_requests(void);
+XBT_PRIVATE void wait_for_requests(void);
 
-XBT_PRIVATE extern double *mc_time;
+XBT_PRIVATE extern std::vector<double> processes_time;
 
 /** Execute a given simcall */
-XBT_PRIVATE void MC_simcall_handle(smx_simcall_t req, int value);
+XBT_PRIVATE void handle_simcall(smx_simcall_t req, int req_num);
 
-SG_END_DECL()
+/** Check if the given simcall is visible
+ *
+ *  \return `TRUE` or `FALSE`
+ */
+XBT_PRIVATE bool request_is_visible(smx_simcall_t req);
+
+}
+}
+
+#endif
 
 #endif