X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/15af6f9bf88ff4bfdd0b8e87039e666ee092fbfe..39c935d6d5ee86d153f6f7e6a10d723ae7c57f6f:/src/mc/mc_base.h

diff --git a/src/mc/mc_base.h b/src/mc/mc_base.h
index 5d9baa02f3..189388f509 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-2021. 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,46 +6,41 @@
 #ifndef SIMGRID_MC_BASE_H
 #define SIMGRID_MC_BASE_H
 
-#ifdef __cplusplus
-#include <vector>
-#endif
-
-#include <xbt/base.h>
-#include <simgrid/forward.h>
+#include "simgrid/forward.h"
 
 #ifdef __cplusplus
 
+#include <vector>
+
 namespace simgrid {
 namespace mc {
 
-/** Can this requests can be executed?
- *
- *  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 request_is_enabled(smx_simcall_t req);
-
 /** Execute everything which is invisible
  *
  *  Execute all the processes that are ready to run and all invisible 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 wait_for_requests(void);
+XBT_PRIVATE void wait_for_requests();
 
 XBT_PRIVATE extern std::vector<double> processes_time;
 
 /** Execute a given simcall */
 XBT_PRIVATE void handle_simcall(smx_simcall_t req, int req_num);
 
-/** Check if the given simcall is visible
+/** Is the process ready to execute its simcall?
  *
- *  \return `TRUE` or `FALSE`
+ *  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 enabled in SimGridMC).
  */
-XBT_PRIVATE bool request_is_visible(smx_simcall_t req);
+XBT_PRIVATE bool actor_is_enabled(smx_actor_t process);
 
+/** Check if the given simcall is visible */
+XBT_PRIVATE bool request_is_visible(const s_smx_simcall* req);
 }
 }