#include "mc_request.h"
#include "mc_safety.h"
#include "mc_private.h"
+#include "mc_smx.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_request, mc,
"Logging specific to MC (request)");
{
char *type = NULL, *args = NULL, *str = NULL, *p = NULL, *bs = NULL;
smx_synchro_t act = NULL;
+ smx_mutex_t mutex = NULL;
size_t size = 0;
- // FIXME, host_get_name
- // FIXME, buffer access (issuer->name, issuer->smx_host)
-
- smx_process_t issuer = MC_process_get_issuer(&mc_model_checker->process, req);
+ smx_process_t issuer = MC_smx_simcall_get_issuer(req);
switch (req->call) {
case SIMCALL_COMM_ISEND:
if (issuer->smx_host)
args =
bprintf("src=(%lu)%s (%s), buff=%s, size=%s", issuer->pid,
- MSG_host_get_name(issuer->smx_host), issuer->name,
+ MC_smx_process_get_host_name(issuer),
+ MC_smx_process_get_name(issuer),
p, bs);
else
args =
bprintf("src=(%lu)%s, buff=%s, size=%s", issuer->pid,
- issuer->name, p, bs);
+ MC_smx_process_get_name(issuer), p, bs);
break;
case SIMCALL_COMM_IRECV:
size =
if (issuer->smx_host)
args =
bprintf("dst=(%lu)%s (%s), buff=%s, size=%s", issuer->pid,
- MSG_host_get_name(issuer->smx_host), issuer->name,
+ MC_smx_process_get_host_name(issuer),
+ MC_smx_process_get_name(issuer),
p, bs);
else
args =
bprintf("dst=(%lu)%s, buff=%s, size=%s", issuer->pid,
- issuer->name, p, bs);
+ MC_smx_process_get_name(issuer),
+ p, bs);
break;
case SIMCALL_COMM_WAIT:
act = simcall_comm_wait__get__comm(req);
} else {
type = xbt_strdup("Wait");
p = pointer_to_string(act);
+ // TODO, fix remote access to comm
+ 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);
args = bprintf("comm=%s [(%lu)%s (%s)-> (%lu)%s (%s)]", p,
- act->comm.src_proc ? act->comm.src_proc->pid : 0,
- act->comm.src_proc ? MSG_host_get_name(act->comm.src_proc->
- smx_host) : "",
- act->comm.src_proc ? act->comm.src_proc->name : "",
- act->comm.dst_proc ? act->comm.dst_proc->pid : 0,
- act->comm.dst_proc ? MSG_host_get_name(act->comm.dst_proc->
- smx_host) : "",
- act->comm.dst_proc ? act->comm.dst_proc->name : "");
+ 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) : "");
}
break;
case SIMCALL_COMM_TEST:
} else {
type = xbt_strdup("Test TRUE");
p = pointer_to_string(act);
+ // TODO, get process, get process name
+ 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);
args = bprintf("comm=%s [(%lu)%s (%s) -> (%lu)%s (%s)]", p,
- act->comm.src_proc->pid, act->comm.src_proc->name,
- MSG_host_get_name(act->comm.src_proc->smx_host),
- act->comm.dst_proc->pid, act->comm.dst_proc->name,
- MSG_host_get_name(act->comm.dst_proc->smx_host));
+ 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));
}
break;
}
break;
+ case SIMCALL_MUTEX_LOCK:
+ mutex = simcall_mutex_lock__get__mutex(req);
+ type = xbt_strdup("Mutex LOCK");
+ args = bprintf("locked = %d, owner = %d, sleeping = %d", mutex->locked, mutex->owner != NULL ? (int)mutex->owner->pid : -1, xbt_swag_size(mutex->sleeping));
+ break;
+
case SIMCALL_MC_SNAPSHOT:
type = xbt_strdup("MC_SNAPSHOT");
args = NULL;
}
if (args != NULL) {
+ // FIXME, get process name
str =
bprintf("[(%lu)%s (%s)] %s(%s)", issuer->pid,
- MSG_host_get_name(issuer->smx_host), issuer->name,
+ MC_smx_process_get_host_name(issuer),
+ MC_smx_process_get_name(issuer),
type, args);
} else {
+ // FIXME, get process name
str =
bprintf("[(%lu)%s (%s)] %s ", issuer->pid,
- MSG_host_get_name(issuer->smx_host), issuer->name,
+ MC_smx_process_get_host_name(issuer),
+ MC_smx_process_get_name(issuer),
type);
}
smx_synchro_t action;
xbt_dynar_foreach(simcall_comm_testany__get__comms(req), cursor, action) {
+ // FIXME, remote access to comm object
if (action->comm.src_proc && action->comm.dst_proc)
return FALSE;
}
{
smx_synchro_t act;
+ // FIXME, remote access to comm object
+
switch (req->call) {
case SIMCALL_COMM_WAIT:
char *MC_request_get_dot_output(smx_simcall_t req, int value)
{
- // TODO, remote access to MSG_host_get_name(issuer->smx_host)
-
char *str = NULL, *label = NULL;
smx_synchro_t act = NULL;
- const smx_process_t issuer = MC_process_get_issuer(&mc_model_checker->process, req);
+ const smx_process_t issuer = MC_smx_simcall_get_issuer(req);
switch (req->call) {
case SIMCALL_COMM_ISEND:
if (issuer->smx_host)
label =
bprintf("[(%lu)%s] iSend", issuer->pid,
- MSG_host_get_name(issuer->smx_host));
+ MC_smx_process_get_host_name(issuer));
else
label = bprintf("[(%lu)] iSend", issuer->pid);
break;
if (issuer->smx_host)
label =
bprintf("[(%lu)%s] iRecv", issuer->pid,
- MSG_host_get_name(issuer->smx_host));
+ MC_smx_process_get_host_name(issuer));
else
label = bprintf("[(%lu)] iRecv", issuer->pid);
break;
if (issuer->smx_host)
label =
bprintf("[(%lu)%s] WaitTimeout", issuer->pid,
- MSG_host_get_name(issuer->smx_host));
+ MC_smx_process_get_host_name(issuer));
else
label = bprintf("[(%lu)] WaitTimeout", issuer->pid);
} else {
+ // FIXME, remote access to act->comm
+ 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);
if (issuer->smx_host)
label =
bprintf("[(%lu)%s] Wait [(%lu)->(%lu)]", issuer->pid,
- MSG_host_get_name(issuer->smx_host),
- act->comm.src_proc ? act->comm.src_proc->pid : 0,
- act->comm.dst_proc ? act->comm.dst_proc->pid : 0);
+ MC_smx_process_get_host_name(issuer),
+ src_proc ? src_proc->pid : 0,
+ dst_proc ? dst_proc->pid : 0);
else
label =
bprintf("[(%lu)] Wait [(%lu)->(%lu)]", issuer->pid,
- act->comm.src_proc ? act->comm.src_proc->pid : 0,
- act->comm.dst_proc ? act->comm.dst_proc->pid : 0);
+ src_proc ? src_proc->pid : 0,
+ dst_proc ? dst_proc->pid : 0);
}
break;
if (issuer->smx_host)
label =
bprintf("[(%lu)%s] Test FALSE", issuer->pid,
- MSG_host_get_name(issuer->smx_host));
+ MC_smx_process_get_host_name(issuer));
else
label = bprintf("[(%lu)] Test FALSE", issuer->pid);
} else {
if (issuer->smx_host)
label =
bprintf("[(%lu)%s] Test TRUE", issuer->pid,
- MSG_host_get_name(issuer->smx_host));
+ MC_smx_process_get_host_name(issuer));
else
label = bprintf("[(%lu)] Test TRUE", issuer->pid);
}
if (issuer->smx_host)
label =
bprintf("[(%lu)%s] WaitAny [%d of %lu]", issuer->pid,
- MSG_host_get_name(issuer->smx_host), value + 1,
+ MC_smx_process_get_host_name(issuer), value + 1,
xbt_dynar_length(simcall_comm_waitany__get__comms(req)));
else
label =
if (issuer->smx_host)
label =
bprintf("[(%lu)%s] TestAny FALSE", issuer->pid,
- MSG_host_get_name(issuer->smx_host));
+ MC_smx_process_get_host_name(issuer));
else
label = bprintf("[(%lu)] TestAny FALSE", issuer->pid);
} else {
if (issuer->smx_host)
label =
bprintf("[(%lu)%s] TestAny TRUE [%d of %lu]", issuer->pid,
- MSG_host_get_name(issuer->smx_host), value + 1,
+ MC_smx_process_get_host_name(issuer), value + 1,
xbt_dynar_length(simcall_comm_testany__get__comms(req)));
else
label =
}
break;
+ case SIMCALL_MUTEX_LOCK:
+ label = bprintf("[(%lu)] Mutex LOCK", req->issuer->pid);
+ break;
+
case SIMCALL_MC_RANDOM:
if (issuer->smx_host)
label =
bprintf("[(%lu)%s] MC_RANDOM (%d)", issuer->pid,
- MSG_host_get_name(issuer->smx_host), value);
+ MC_smx_process_get_host_name(issuer), value);
else
label = bprintf("[(%lu)] MC_RANDOM (%d)", issuer->pid, value);
break;
if (issuer->smx_host)
label =
bprintf("[(%lu)%s] MC_SNAPSHOT", issuer->pid,
- MSG_host_get_name(issuer->smx_host));
+ MC_smx_process_get_host_name(issuer));
else
label = bprintf("[(%lu)] MC_SNAPSHOT", issuer->pid);
break;
if (issuer->smx_host)
label =
bprintf("[(%lu)%s] MC_COMPARE_SNAPSHOTS", issuer->pid,
- MSG_host_get_name(issuer->smx_host));
+ MC_smx_process_get_host_name(issuer));
else
label = bprintf("[(%lu)] MC_COMPARE_SNAPSHOTS", issuer->pid);
break;