#include "xbt/str.h"
#include "xbt/ex.h" /* ex_backtrace_display */
#include "mc/mc.h"
+#include "mc/mc_replay.h"
#include "simgrid/sg_config.h"
#ifdef HAVE_MC
#include "mc/mc_private.h"
-#include "mc/mc_model_checker.h"
#include "mc/mc_protocol.h"
#include "mc/mc_client.h"
#endif
atexit(SIMIX_clean);
#ifdef HAVE_MC
- // The communication initialisation is done ASAP.
- // We need to commuicate initialisation of the different layers to the model-checker.
+ // The communication initialization is done ASAP.
+ // We need to communicate initialization of the different layers to the model-checker.
if (mc_mode == MC_MODE_NONE) {
if (getenv(MC_ENV_SOCKET_FD)) {
mc_mode = MC_MODE_CLIENT;
MC_client_init();
MC_client_hello();
MC_client_handle_messages();
- } else {
- mc_mode = MC_MODE_STANDALONE;
}
}
#endif
* \param arg Parameters of the function
*
*/
-XBT_INLINE void SIMIX_timer_set(double date, void *function, void *arg)
+XBT_INLINE smx_timer_t SIMIX_timer_set(double date, void *function, void *arg)
{
smx_timer_t timer = xbt_new0(s_smx_timer_t, 1);
timer->func = function;
timer->args = arg;
xbt_heap_push(simix_timers, timer, date);
+ return timer;
+}
+/** @brief cancels a timer that was added earlier */
+XBT_INLINE void SIMIX_timer_remove(smx_timer_t timer) {
+ xbt_heap_rm_elm(simix_timers, timer, timer->date);
+}
+
+/** @brief Returns the date at which the timer will trigger (or 0 if NULL timer) */
+XBT_INLINE double SIMIX_timer_get_date(smx_timer_t timer) {
+ return timer?timer->date:0;
}
/**