A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a message to the user to specify our requirement for Boost version
[simgrid.git]
/
src
/
mc
/
mc_base.h
diff --git
a/src/mc/mc_base.h
b/src/mc/mc_base.h
index
fa1fca1
..
a37b947
100644
(file)
--- a/
src/mc/mc_base.h
+++ b/
src/mc/mc_base.h
@@
-7,26
+7,22
@@
#ifndef SIMGRID_MC_BASE_H
#define SIMGRID_MC_BASE_H
#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"
+#include <xbt/base.h>
+#include "src/simix/popping_private.h" // smx_simcall_t
-SG_BEGIN_DECL()
+#ifdef __cplusplus
-/** Check if the given simcall can be resolved
- *
- * \return `TRUE` or `FALSE`
- */
-XBT_PRIVATE int MC_request_is_enabled(smx_simcall_t req);
+namespace simgrid {
+namespace mc {
-/** C
heck if the given simcall is visible
+/** C
an 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
*
/** Execute everything which is invisible
*
@@
-34,13
+30,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.
*/
* 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 */
/** 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 value);
+
+/** Check if the given simcall is visible
+ *
+ * \return `TRUE` or `FALSE`
+ */
+XBT_PRIVATE bool request_is_visible(smx_simcall_t req);
+
+}
+}
-SG_END_DECL()
+#endif
#endif
#endif