#include <xbt/str.h>
#include <xbt/sysdep.h>
#include <xbt/dynar.h>
+#include <xbt/swag.h>
#include "src/mc/mc_request.h"
#include "src/mc/mc_safety.h"
/* FIXME: the following rule assumes that the result of the
* isend/irecv call is not stored in a buffer used in the
* test call. */
- /*if( (r1->call == SIMCALL_COMM_ISEND || r1->call == SIMCALL_COMM_IRECV)
+#if 0
+ if((r1->call == SIMCALL_COMM_ISEND || r1->call == SIMCALL_COMM_IRECV)
&& r2->call == SIMCALL_COMM_TEST)
- return FALSE; */
+ return FALSE;
+#endif
if (r1->call == SIMCALL_COMM_WAIT
&& (r2->call == SIMCALL_COMM_WAIT || r2->call == SIMCALL_COMM_TEST)
- && (synchro1->comm.src_proc == nullptr || synchro1->comm.dst_proc == NULL))
+ && (synchro1->comm.src_proc == nullptr || synchro1->comm.dst_proc == nullptr))
return false;
if (r1->call == SIMCALL_COMM_TEST &&
return true;
}
-// Those are MC_state_get_internal_request(state)
+// Those are internal_req
bool request_depend(smx_simcall_t r1, smx_simcall_t r2)
{
if (r1->issuer == r2->issuer)
std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid::mc::RequestType request_type)
{
+ xbt_assert(mc_mode == MC_MODE_SERVER);
+
bool use_remote_comm = true;
switch(request_type) {
case simgrid::mc::RequestType::simix:
} else
act = remote_act;
- smx_process_t src_proc = MC_smx_resolve_process(act->comm.src_proc);
- smx_process_t dst_proc = MC_smx_resolve_process(act->comm.dst_proc);
+ smx_process_t src_proc = mc_model_checker->process().resolveProcess(
+ simgrid::mc::remote(act->comm.src_proc));
+ smx_process_t dst_proc = mc_model_checker->process().resolveProcess(
+ simgrid::mc::remote(act->comm.dst_proc));
args = bprintf("comm=%s [(%lu)%s (%s)-> (%lu)%s (%s)]", p,
src_proc ? src_proc->pid : 0,
src_proc ? MC_smx_process_get_host_name(src_proc) : "",
act = remote_act;
char* p;
- if (act->comm.src_proc == nullptr || act->comm.dst_proc == NULL) {
+ if (act->comm.src_proc == nullptr || act->comm.dst_proc == nullptr) {
type = "Test FALSE";
p = pointer_to_string(remote_act);
args = bprintf("comm=%s", p);
type = "Test TRUE";
p = pointer_to_string(remote_act);
- smx_process_t src_proc = MC_smx_resolve_process(act->comm.src_proc);
- smx_process_t dst_proc = MC_smx_resolve_process(act->comm.dst_proc);
+ smx_process_t src_proc = mc_model_checker->process().resolveProcess(
+ simgrid::mc::remote(act->comm.src_proc));
+ smx_process_t dst_proc = mc_model_checker->process().resolveProcess(
+ simgrid::mc::remote(act->comm.dst_proc));
args = bprintf("comm=%s [(%lu)%s (%s) -> (%lu)%s (%s)]", p,
src_proc->pid,
MC_smx_process_get_name(src_proc),
args = bprintf("locked = %d, owner = %d, sleeping = %d",
mutex.locked,
- mutex.owner != nullptr ? (int) MC_smx_resolve_process(mutex.owner)->pid : -1,
+ mutex.owner != nullptr ? (int) mc_model_checker->process().resolveProcess(
+ simgrid::mc::remote(mutex.owner))->pid : -1,
mutex_sleeping.count);
break;
}
mc_model_checker->process().read_bytes(&synchro,
sizeof(synchro), remote(remote_act));
- smx_process_t src_proc = MC_smx_resolve_process(synchro.comm.src_proc);
- smx_process_t dst_proc = MC_smx_resolve_process(synchro.comm.dst_proc);
+ smx_process_t src_proc = mc_model_checker->process().resolveProcess(
+ simgrid::mc::remote(synchro.comm.src_proc));
+ smx_process_t dst_proc = mc_model_checker->process().resolveProcess(
+ simgrid::mc::remote(synchro.comm.dst_proc));
if (issuer->host)
label = simgrid::xbt::string_printf("[(%lu)%s] Wait [(%lu)->(%lu)]",
issuer->pid,
s_smx_synchro_t synchro;
mc_model_checker->process().read_bytes(&synchro,
sizeof(synchro), remote(remote_act));
- if (synchro.comm.src_proc == nullptr || synchro.comm.dst_proc == NULL) {
+ if (synchro.comm.src_proc == nullptr || synchro.comm.dst_proc == nullptr) {
if (issuer->host)
label = simgrid::xbt::string_printf("[(%lu)%s] Test FALSE",
issuer->pid,