if (r1->issuer == r2->issuer)
return false;
- /* Wait with timeout transitions are not considered by the independence theorem, thus we consider them as dependant with all other transitions */
+ /* Wait with timeout transitions are not considered by the independence theorem, thus we consider them as dependent with all other transitions */
if ((r1->call == SIMCALL_COMM_WAIT && simcall_comm_wait__get__timeout(r1) > 0)
|| (r2->call == SIMCALL_COMM_WAIT
&& simcall_comm_wait__get__timeout(r2) > 0))
const char* type = nullptr;
char *args = nullptr;
- smx_process_t issuer = MC_smx_simcall_get_issuer(req);
+ smx_actor_t issuer = MC_smx_simcall_get_issuer(req);
switch (req->call) {
char* p = pointer_to_string(simcall_comm_isend__get__src_buff(req));
char* bs = buff_size_to_string(simcall_comm_isend__get__src_buff_size(req));
if (issuer->host)
- args =
- bprintf("src=(%lu)%s (%s), buff=%s, size=%s", issuer->pid,
- MC_smx_process_get_host_name(issuer),
- MC_smx_process_get_name(issuer),
- p, bs);
+ args = bprintf("src=(%lu)%s (%s), buff=%s, size=%s", issuer->pid, MC_smx_actor_get_host_name(issuer),
+ MC_smx_actor_get_name(issuer), p, bs);
else
- args =
- bprintf("src=(%lu)%s, buff=%s, size=%s", issuer->pid,
- MC_smx_process_get_name(issuer), p, bs);
+ args = bprintf("src=(%lu)%s, buff=%s, size=%s", issuer->pid, MC_smx_actor_get_name(issuer), p, bs);
xbt_free(bs);
xbt_free(p);
break;
char* p = pointer_to_string(simcall_comm_irecv__get__dst_buff(req));
char* bs = buff_size_to_string(size);
if (issuer->host)
- args =
- bprintf("dst=(%lu)%s (%s), buff=%s, size=%s", issuer->pid,
- MC_smx_process_get_host_name(issuer),
- MC_smx_process_get_name(issuer),
- p, bs);
+ args = bprintf("dst=(%lu)%s (%s), buff=%s, size=%s", issuer->pid, MC_smx_actor_get_host_name(issuer),
+ MC_smx_actor_get_name(issuer), p, bs);
else
- args =
- bprintf("dst=(%lu)%s, buff=%s, size=%s", issuer->pid,
- MC_smx_process_get_name(issuer),
- p, bs);
+ args = bprintf("dst=(%lu)%s, buff=%s, size=%s", issuer->pid, MC_smx_actor_get_name(issuer), p, bs);
xbt_free(bs);
xbt_free(p);
break;
} else
act = remote_act;
- smx_process_t src_proc = mc_model_checker->process().resolveProcess(
- simgrid::mc::remote(act->src_proc));
- smx_process_t dst_proc = mc_model_checker->process().resolveProcess(
- simgrid::mc::remote(act->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) : "",
- src_proc ? MC_smx_process_get_name(src_proc) : "",
- dst_proc ? dst_proc->pid : 0,
- dst_proc ? MC_smx_process_get_host_name(dst_proc) : "",
- dst_proc ? MC_smx_process_get_name(dst_proc) : "");
+ smx_actor_t src_proc = mc_model_checker->process().resolveActor(simgrid::mc::remote(act->src_proc));
+ smx_actor_t dst_proc = mc_model_checker->process().resolveActor(simgrid::mc::remote(act->dst_proc));
+ args =
+ bprintf("comm=%s [(%lu)%s (%s)-> (%lu)%s (%s)]", p, src_proc ? src_proc->pid : 0,
+ src_proc ? MC_smx_actor_get_host_name(src_proc) : "", src_proc ? MC_smx_actor_get_name(src_proc) : "",
+ dst_proc ? dst_proc->pid : 0, dst_proc ? MC_smx_actor_get_host_name(dst_proc) : "",
+ dst_proc ? MC_smx_actor_get_name(dst_proc) : "");
}
xbt_free(p);
break;
type = "Test TRUE";
p = pointer_to_string(remote_act);
- smx_process_t src_proc = mc_model_checker->process().resolveProcess(
- simgrid::mc::remote(act->src_proc));
- smx_process_t dst_proc = mc_model_checker->process().resolveProcess(
- simgrid::mc::remote(act->dst_proc));
- args = bprintf("comm=%s [(%lu)%s (%s) -> (%lu)%s (%s)]", p,
- src_proc->pid,
- MC_smx_process_get_name(src_proc),
- MC_smx_process_get_host_name(src_proc),
- dst_proc->pid,
- MC_smx_process_get_name(dst_proc),
- MC_smx_process_get_host_name(dst_proc));
+ smx_actor_t src_proc = mc_model_checker->process().resolveActor(simgrid::mc::remote(act->src_proc));
+ smx_actor_t dst_proc = mc_model_checker->process().resolveActor(simgrid::mc::remote(act->dst_proc));
+ args = bprintf("comm=%s [(%lu)%s (%s) -> (%lu)%s (%s)]", p, src_proc->pid, MC_smx_actor_get_name(src_proc),
+ MC_smx_actor_get_host_name(src_proc), dst_proc->pid, MC_smx_actor_get_name(dst_proc),
+ MC_smx_actor_get_host_name(dst_proc));
}
xbt_free(p);
break;
s_xbt_dynar_t comms;
mc_model_checker->process().read_bytes(
&comms, sizeof(comms), remote(simcall_comm_waitany__get__comms(req)));
- if (!xbt_dynar_is_empty(&comms)) {
- smx_synchro_t remote_sync;
+ if (not xbt_dynar_is_empty(&comms)) {
+ smx_activity_t remote_sync;
read_element(mc_model_checker->process(),
&remote_sync, remote(simcall_comm_waitany__get__comms(req)), value,
sizeof(remote_sync));
mc_model_checker->process().read_bytes(&mutex_sleeping, sizeof(mutex_sleeping),
remote(mutex.getBuffer()->sleeping));
- args = bprintf("locked = %d, owner = %d, sleeping = %d",
- mutex.getBuffer()->locked,
- mutex.getBuffer()->owner != nullptr ? (int) mc_model_checker->process().resolveProcess(
- simgrid::mc::remote(mutex.getBuffer()->owner))->pid : -1,
- mutex_sleeping.count);
+ args =
+ bprintf("locked = %d, owner = %d, sleeping = %d", mutex.getBuffer()->locked,
+ mutex.getBuffer()->owner != nullptr
+ ? (int)mc_model_checker->process().resolveActor(simgrid::mc::remote(mutex.getBuffer()->owner))->pid
+ : -1,
+ mutex_sleeping.count);
break;
}
break;
default:
- THROW_UNIMPLEMENTED;
+ type = SIMIX_simcall_name(req->call);
+ args = bprintf("??");
+ break;
}
std::string str;
if (args != nullptr)
- str = simgrid::xbt::string_printf("[(%lu)%s (%s)] %s(%s)", issuer->pid,
- MC_smx_process_get_host_name(issuer),
- MC_smx_process_get_name(issuer),
- type, args);
+ str = simgrid::xbt::string_printf("[(%lu)%s (%s)] %s(%s)", issuer->pid, MC_smx_actor_get_host_name(issuer),
+ MC_smx_actor_get_name(issuer), type, args);
else
- str = simgrid::xbt::string_printf("[(%lu)%s (%s)] %s ", issuer->pid,
- MC_smx_process_get_host_name(issuer),
- MC_smx_process_get_name(issuer),
- type);
+ str = simgrid::xbt::string_printf("[(%lu)%s (%s)] %s ", issuer->pid, MC_smx_actor_get_host_name(issuer),
+ MC_smx_actor_get_name(issuer), type);
xbt_free(args);
return str;
}
bool request_is_enabled_by_idx(smx_simcall_t req, unsigned int idx)
{
- smx_synchro_t remote_act = nullptr;
+ smx_activity_t remote_act = nullptr;
switch (req->call) {
case SIMCALL_COMM_WAIT:
return comm->src_proc && comm->dst_proc;
}
-bool process_is_enabled(smx_process_t process)
+bool actor_is_enabled(smx_actor_t actor)
{
- return simgrid::mc::request_is_enabled(&process->simcall);
+ return simgrid::mc::request_is_enabled(&actor->simcall);
}
static const char* colors[] = {
{
std::string label;
- const smx_process_t issuer = MC_smx_simcall_get_issuer(req);
+ const smx_actor_t issuer = MC_smx_simcall_get_issuer(req);
switch (req->call) {
case SIMCALL_COMM_ISEND:
if (issuer->host)
- label = simgrid::xbt::string_printf("[(%lu)%s] iSend", issuer->pid,
- MC_smx_process_get_host_name(issuer));
+ label = simgrid::xbt::string_printf("[(%lu)%s] iSend", issuer->pid, MC_smx_actor_get_host_name(issuer));
else
label = bprintf("[(%lu)] iSend", issuer->pid);
break;
case SIMCALL_COMM_IRECV:
if (issuer->host)
- label = simgrid::xbt::string_printf("[(%lu)%s] iRecv", issuer->pid,
- MC_smx_process_get_host_name(issuer));
+ label = simgrid::xbt::string_printf("[(%lu)%s] iRecv", issuer->pid, MC_smx_actor_get_host_name(issuer));
else
label = simgrid::xbt::string_printf("[(%lu)] iRecv", issuer->pid);
break;
case SIMCALL_COMM_WAIT: {
if (value == -1) {
if (issuer->host)
- label = simgrid::xbt::string_printf("[(%lu)%s] WaitTimeout", issuer->pid,
- MC_smx_process_get_host_name(issuer));
+ label = simgrid::xbt::string_printf("[(%lu)%s] WaitTimeout", issuer->pid, MC_smx_actor_get_host_name(issuer));
else
label = simgrid::xbt::string_printf("[(%lu)] WaitTimeout", issuer->pid);
} else {
- smx_synchro_t remote_act = simcall_comm_wait__get__comm(req);
+ smx_activity_t remote_act = simcall_comm_wait__get__comm(req);
simgrid::mc::Remote<simgrid::kernel::activity::Comm> temp_comm;
mc_model_checker->process().read(temp_comm, remote(
static_cast<simgrid::kernel::activity::Comm*>(remote_act)));
simgrid::kernel::activity::Comm* comm = temp_comm.getBuffer();
- smx_process_t src_proc = mc_model_checker->process().resolveProcess(
- simgrid::mc::remote(comm->src_proc));
- smx_process_t dst_proc = mc_model_checker->process().resolveProcess(
- simgrid::mc::remote(comm->dst_proc));
+ smx_actor_t src_proc = mc_model_checker->process().resolveActor(simgrid::mc::remote(comm->src_proc));
+ smx_actor_t dst_proc = mc_model_checker->process().resolveActor(simgrid::mc::remote(comm->dst_proc));
if (issuer->host)
- label = simgrid::xbt::string_printf("[(%lu)%s] Wait [(%lu)->(%lu)]",
- issuer->pid,
- MC_smx_process_get_host_name(issuer),
- src_proc ? src_proc->pid : 0,
- dst_proc ? dst_proc->pid : 0);
+ label = simgrid::xbt::string_printf("[(%lu)%s] Wait [(%lu)->(%lu)]", issuer->pid,
+ MC_smx_actor_get_host_name(issuer), src_proc ? src_proc->pid : 0,
+ dst_proc ? dst_proc->pid : 0);
else
label = simgrid::xbt::string_printf("[(%lu)] Wait [(%lu)->(%lu)]",
issuer->pid,
}
case SIMCALL_COMM_TEST: {
- smx_synchro_t remote_act = simcall_comm_test__get__comm(req);
+ smx_activity_t remote_act = simcall_comm_test__get__comm(req);
simgrid::mc::Remote<simgrid::kernel::activity::Comm> temp_comm;
mc_model_checker->process().read(temp_comm, remote(
static_cast<simgrid::kernel::activity::Comm*>(remote_act)));
simgrid::kernel::activity::Comm* comm = temp_comm.getBuffer();
if (comm->src_proc == nullptr || comm->dst_proc == nullptr) {
if (issuer->host)
- label = simgrid::xbt::string_printf("[(%lu)%s] Test FALSE",
- issuer->pid,
- MC_smx_process_get_host_name(issuer));
+ label = simgrid::xbt::string_printf("[(%lu)%s] Test FALSE", issuer->pid, MC_smx_actor_get_host_name(issuer));
else
label = bprintf("[(%lu)] Test FALSE", issuer->pid);
} else {
if (issuer->host)
- label = simgrid::xbt::string_printf("[(%lu)%s] Test TRUE", issuer->pid,
- MC_smx_process_get_host_name(issuer));
+ label = simgrid::xbt::string_printf("[(%lu)%s] Test TRUE", issuer->pid, MC_smx_actor_get_host_name(issuer));
else
label = simgrid::xbt::string_printf("[(%lu)] Test TRUE", issuer->pid);
}
unsigned long comms_size = read_length(
mc_model_checker->process(), remote(simcall_comm_waitany__get__comms(req)));
if (issuer->host)
- label = simgrid::xbt::string_printf("[(%lu)%s] WaitAny [%d of %lu]",
- issuer->pid,
- MC_smx_process_get_host_name(issuer), value + 1,
- comms_size);
+ label = simgrid::xbt::string_printf("[(%lu)%s] WaitAny [%d of %lu]", issuer->pid,
+ MC_smx_actor_get_host_name(issuer), value + 1, comms_size);
else
label = simgrid::xbt::string_printf("[(%lu)] WaitAny [%d of %lu]",
issuer->pid, value + 1, comms_size);
case SIMCALL_COMM_TESTANY:
if (value == -1) {
if (issuer->host)
- label = simgrid::xbt::string_printf("[(%lu)%s] TestAny FALSE",
- issuer->pid, MC_smx_process_get_host_name(issuer));
+ label = simgrid::xbt::string_printf("[(%lu)%s] TestAny FALSE", issuer->pid, MC_smx_actor_get_host_name(issuer));
else
label = simgrid::xbt::string_printf("[(%lu)] TestAny FALSE", issuer->pid);
} else {
if (issuer->host)
- label = simgrid::xbt::string_printf("[(%lu)%s] TestAny TRUE [%d of %lu]",
- issuer->pid,
- MC_smx_process_get_host_name(issuer), value + 1,
- simcall_comm_testany__get__count(req));
+ label = simgrid::xbt::string_printf("[(%lu)%s] TestAny TRUE [%d of %lu]", issuer->pid,
+ MC_smx_actor_get_host_name(issuer), value + 1,
+ simcall_comm_testany__get__count(req));
else
label = simgrid::xbt::string_printf("[(%lu)] TestAny TRUE [%d of %lu]",
issuer->pid,
case SIMCALL_MC_RANDOM:
if (issuer->host)
- label = simgrid::xbt::string_printf("[(%lu)%s] MC_RANDOM (%d)",
- issuer->pid, MC_smx_process_get_host_name(issuer), value);
+ label = simgrid::xbt::string_printf("[(%lu)%s] MC_RANDOM (%d)", issuer->pid, MC_smx_actor_get_host_name(issuer),
+ value);
else
label = simgrid::xbt::string_printf("[(%lu)] MC_RANDOM (%d)", issuer->pid, value);
break;