/* 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. */
+#include "mc_state.h"
+#include "mc_comm_pattern.h"
+#include "mc_request.h"
+#include "mc_safety.h"
#include "mc_private.h"
+#include "mc_record.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_comm_determinism, mc,
"Logging specific to MC communication determinism detection");
}
}
-static void update_comm_pattern(mc_comm_pattern_t comm_pattern, smx_action_t comm)
+static void update_comm_pattern(mc_comm_pattern_t comm_pattern, smx_synchro_t comm)
{
void *addr_pointed;
comm_pattern->src_proc = comm->comm.src_proc->pid;
}
-void complete_comm_pattern(xbt_dynar_t list, smx_action_t comm)
+void complete_comm_pattern(xbt_dynar_t list, smx_synchro_t comm)
{
mc_comm_pattern_t current_comm_pattern;
unsigned int cursor = 0;
smx_simcall_t req = NULL;
smx_process_t process = NULL;
mc_state_t state = NULL, next_state = NULL;
- smx_action_t current_comm;
xbt_dynar_t current_pattern;
while (xbt_fifo_size(mc_stack) > 0) {
}
/* Answer the request */
- SIMIX_simcall_enter(req, value); /* After this call req is no longer usefull */
+ SIMIX_simcall_handle(req, value); /* After this call req is no longer useful */
MC_SET_MC_HEAP;
current_pattern = !initial_global_state->initial_communications_pattern_done ? initial_communications_pattern : communications_pattern;
- if (call == MC_CALL_TYPE_SEND) { /* Send */
- get_comm_pattern(current_pattern, req, call);
- } else if (call == MC_CALL_TYPE_RECV) { /* Recv */
- get_comm_pattern(current_pattern, req, call);
- } else if (call == MC_CALL_TYPE_WAIT) { /* Wait */
- current_comm = simcall_comm_wait__get__comm(req);
- if (current_comm->comm.refcount == 1) /* First wait only must be considered */
- complete_comm_pattern(current_pattern, current_comm);
- } else if (call == MC_CALL_TYPE_WAITANY) { /* WaitAny */
- current_comm = xbt_dynar_get_as(simcall_comm_waitany__get__comms(req), value, smx_action_t);
- if (current_comm->comm.refcount == 1) /* First wait only must be considered */
- complete_comm_pattern(current_pattern, current_comm);
- }
+ mc_update_comm_pattern(call, req, value, current_pattern);
MC_SET_STD_HEAP;
/* Wait for requests (schedules processes) */