- char *type = NULL, *args = NULL, *str = NULL, *p = NULL, *bs = NULL;
- smx_action_t act = NULL;
- size_t size = 0;
-
- switch(req->call){
- case REQ_COMM_ISEND:
- type = xbt_strdup("iSend");
- p = pointer_to_string(req->comm_isend.src_buff);
- bs = buff_size_to_string(req->comm_isend.src_buff_size);
- args = bprintf("src=%s, buff=%s, size=%s", req->issuer->name, p, bs);
- break;
- case REQ_COMM_IRECV:
- size = req->comm_irecv.dst_buff_size ? *req->comm_irecv.dst_buff_size : 0;
- type = xbt_strdup("iRecv");
- p = pointer_to_string(req->comm_irecv.dst_buff);
- bs = buff_size_to_string(size);
- args = bprintf("dst=%s, buff=%s, size=%s", req->issuer->name, p, bs);
- break;
- case REQ_COMM_WAIT:
- act = req->comm_wait.comm;
- if(value == -1){
- type = xbt_strdup("WaitTimeout");
- p = pointer_to_string(act);
- args = bprintf("comm=%p", p);
- }else{
- type = xbt_strdup("Wait");
- p = pointer_to_string(act);
- args = bprintf("comm=%s [(%lu)%s -> (%lu)%s]", p,
- act->comm.src_proc ? act->comm.src_proc->pid : 0,
- act->comm.src_proc ? act->comm.src_proc->name : "",
- act->comm.dst_proc ? act->comm.dst_proc->pid : 0,
- act->comm.dst_proc ? act->comm.dst_proc->name : "");
- }
- break;
- case REQ_COMM_TEST:
- act = req->comm_test.comm;
- if(act->comm.src_proc == NULL || act->comm.src_proc == NULL){
- type = xbt_strdup("Test FALSE");
- p = pointer_to_string(act);
- args = bprintf("comm=%s", p);
- }else{
- type = xbt_strdup("Test TRUE");
- p = pointer_to_string(act);
- args = bprintf("comm=%s [(%lu)%s -> (%lu)%s]", p,
- act->comm.src_proc ? act->comm.src_proc->pid : 0,
- act->comm.src_proc ? act->comm.src_proc->name : "",
- act->comm.dst_proc ? act->comm.dst_proc->pid : 0,
- act->comm.dst_proc ? act->comm.dst_proc->name : "");
- }
- break;
-
- case REQ_COMM_WAITANY:
- type = xbt_strdup("WaitAny");
- p = pointer_to_string(xbt_dynar_get_as(req->comm_waitany.comms, value, smx_action_t));
- args = bprintf("comm=%s (%d of %lu)", p,
- value+1, xbt_dynar_length(req->comm_waitany.comms));
- break;
-
- case REQ_COMM_TESTANY:
- if(value == -1){
- type = xbt_strdup("TestAny FALSE");
- args = xbt_strdup("-");
- }else{
- type = xbt_strdup("TestAny");
- args = bprintf("(%d of %lu)", value+1, xbt_dynar_length(req->comm_testany.comms));
- }
- break;
-
- default:
- THROW_UNIMPLEMENTED;
+ const char* type = NULL;
+ char *args = NULL;
+
+ smx_process_t issuer = MC_smx_simcall_get_issuer(req);
+
+ switch (req->call) {
+
+ case SIMCALL_COMM_ISEND: {
+ type = "iSend";
+ 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->smx_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);
+ else
+ args =
+ bprintf("src=(%lu)%s, buff=%s, size=%s", issuer->pid,
+ MC_smx_process_get_name(issuer), p, bs);
+ xbt_free(bs);
+ xbt_free(p);
+ break;
+ }
+
+ case SIMCALL_COMM_IRECV: {
+ size_t* remote_size = simcall_comm_irecv__get__dst_buff_size(req);
+
+ // size_t size = size_pointer ? *size_pointer : 0;
+ size_t size = 0;
+ if (remote_size)
+ MC_process_read_simple(&mc_model_checker->process, &size,
+ remote_size, sizeof(size));
+
+ type = "iRecv";
+ char* p = pointer_to_string(simcall_comm_irecv__get__dst_buff(req));
+ char* bs = buff_size_to_string(size);
+ if (issuer->smx_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);
+ else
+ args =
+ bprintf("dst=(%lu)%s, buff=%s, size=%s", issuer->pid,
+ MC_smx_process_get_name(issuer),
+ p, bs);
+ xbt_free(bs);
+ xbt_free(p);
+ break;
+ }
+
+ case SIMCALL_COMM_WAIT: {
+ smx_synchro_t remote_act = simcall_comm_wait__get__comm(req);
+ char* p;
+ if (value == -1) {
+ type = "WaitTimeout";
+ p = pointer_to_string(remote_act);
+ args = bprintf("comm=%s", p);
+ } else {
+ type = "Wait";
+ p = pointer_to_string(remote_act);
+
+ s_smx_synchro_t synchro;
+ MC_process_read_simple(&mc_model_checker->process, &synchro,
+ remote_act, sizeof(synchro));
+
+ 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);
+ 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) : "");
+ }
+ xbt_free(p);
+ break;
+ }
+
+ case SIMCALL_COMM_TEST: {
+ smx_synchro_t remote_act = simcall_comm_test__get__comm(req);
+ s_smx_synchro_t synchro;
+ MC_process_read_simple(&mc_model_checker->process, &synchro,
+ remote_act, sizeof(synchro));
+
+ char* p;
+ if (synchro.comm.src_proc == NULL || synchro.comm.dst_proc == NULL) {
+ type = "Test FALSE";
+ p = pointer_to_string(remote_act);
+ args = bprintf("comm=%s", p);
+ } else {
+ type = "Test TRUE";
+ p = pointer_to_string(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);
+ 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));
+ }
+ xbt_free(p);
+ break;