#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
*
* 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
