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

diff --git a/src/mc/mc_base.h b/src/mc/mc_base.h
index a72fbce3e4..f66f1828ef 100644
--- a/src/mc/mc_base.h
+++ b/src/mc/mc_base.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2008-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2008-2019. 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,29 +6,14 @@
 #ifndef SIMGRID_MC_BASE_H
 #define SIMGRID_MC_BASE_H
 
-#include <xbt/misc.h>
-#include <simgrid/simix.h>
-#include "simgrid_config.h"
-#include "internal_config.h"
-#include "../simix/smx_private.h"
+#include "simgrid/forward.h"
 
-// Marker for symbols which should be defined as XBT_PRIVATE but are used in
-// unit tests:
-#define MC_SHOULD_BE_INTERNAL
+#ifdef __cplusplus
 
-SG_BEGIN_DECL()
+#include <vector>
 
-/** Check if the given simcall can be resolved
- *
- *  \return `TRUE` or `FALSE`
- */
-int MC_request_is_enabled(smx_simcall_t req);
-
-/** Check if the given simcall is visible
- *
- *  \return `TRUE` or `FALSE`
- */
-int MC_request_is_visible(smx_simcall_t req);
+namespace simgrid {
+namespace mc {
 
 /** Execute everything which is invisible
  *
@@ -37,10 +21,30 @@ 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.
  */
-void MC_wait_for_requests(void);
+XBT_PRIVATE void wait_for_requests();
+
+XBT_PRIVATE extern std::vector<double> processes_time;
 
-XBT_INTERNAL extern double *mc_time;
+/** Execute a given simcall */
+XBT_PRIVATE void handle_simcall(smx_simcall_t req, int req_num);
 
-SG_END_DECL()
+/** 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 actor_is_enabled(smx_actor_t process);
+
+/** Check if the given simcall is visible */
+XBT_PRIVATE bool request_is_visible(smx_simcall_t req);
+
+}
+}
+
+#endif
 
 #endif