#include "private.h"
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_request, mc,
+ "Logging specific to MC (request)");
+
+static char* pointer_to_string(void* pointer);
+
int MC_request_depend(smx_req_t r1, smx_req_t r2)
{
+ if(_surf_do_model_check == 2)
+ return TRUE;
+
if (r1->issuer == r2->issuer)
return FALSE;
if(r1->call == REQ_COMM_IRECV && r2->call == REQ_COMM_ISEND)
return FALSE;
+ if( (r1->call == REQ_COMM_ISEND || r1->call == REQ_COMM_IRECV)
+ && r2->call == REQ_COMM_WAIT){
+
+ if(r2->comm_wait.comm->comm.rdv == NULL)
+ return FALSE;
+
+ smx_rdv_t rdv = r1->call == REQ_COMM_ISEND ? r1->comm_isend.rdv : r1->comm_irecv.rdv;
+
+ if(r2->comm_wait.comm->comm.rdv != rdv)
+ return FALSE;
+
+ if(r2->comm_wait.comm->comm.type == SIMIX_COMM_SEND && r1->call == REQ_COMM_ISEND)
+ return FALSE;
+
+ if(r2->comm_wait.comm->comm.type == SIMIX_COMM_RECEIVE && r1->call == REQ_COMM_IRECV)
+ return FALSE;
+ }
+
+ if( (r2->call == REQ_COMM_ISEND || r2->call == REQ_COMM_IRECV)
+ && r1->call == REQ_COMM_WAIT){
+
+ if(r1->comm_wait.comm->comm.rdv != NULL)
+ return FALSE;
+
+ smx_rdv_t rdv = r2->call == REQ_COMM_ISEND ? r2->comm_isend.rdv : r2->comm_irecv.rdv;
+
+ if(r1->comm_wait.comm->comm.rdv != rdv)
+ return FALSE;
+
+ if(r1->comm_wait.comm->comm.type == SIMIX_COMM_SEND && r2->call == REQ_COMM_ISEND)
+ return FALSE;
+
+ if(r1->comm_wait.comm->comm.type == SIMIX_COMM_RECEIVE && r2->call == REQ_COMM_IRECV)
+ return FALSE;
+ }
+
/* FIXME: the following rule assumes that the result of the
* isend/irecv call is not stored in a buffer used in the
- * wait/test call.
+ * test call. */
if( (r1->call == REQ_COMM_ISEND || r1->call == REQ_COMM_IRECV)
- && (r2->call == REQ_COMM_WAIT || r2->call == REQ_COMM_TEST))
- return FALSE;*/
+ && r2->call == REQ_COMM_TEST)
+ return FALSE;
/* FIXME: the following rule assumes that the result of the
* isend/irecv call is not stored in a buffer used in the
- * wait/test call.
+ * test call.*/
if( (r2->call == REQ_COMM_ISEND || r2->call == REQ_COMM_IRECV)
- && (r1->call == REQ_COMM_WAIT || r1->call == REQ_COMM_TEST))
- return FALSE;*/
+ && r1->call == REQ_COMM_TEST)
+ return FALSE;
if(r1->call == REQ_COMM_ISEND && r2->call == REQ_COMM_ISEND
&& r1->comm_isend.rdv != r2->comm_isend.rdv)
&& r1->comm_irecv.rdv != r2->comm_irecv.rdv)
return FALSE;
+ if(r1->call == REQ_COMM_WAIT && (r2->call == REQ_COMM_WAIT || r2->call == REQ_COMM_TEST)
+ && (r1->comm_wait.comm->comm.src_proc == NULL
+ || r1->comm_wait.comm->comm.dst_proc == NULL))
+ return FALSE;
+
+ if(r2->call == REQ_COMM_WAIT && (r1->call == REQ_COMM_WAIT || r1->call == REQ_COMM_TEST)
+ && (r2->comm_wait.comm->comm.src_proc == NULL
+ || r2->comm_wait.comm->comm.dst_proc == NULL))
+ return FALSE;
+
if(r1->call == REQ_COMM_WAIT && r2->call == REQ_COMM_WAIT
&& r1->comm_wait.comm->comm.src_buff == r2->comm_wait.comm->comm.src_buff
&& r1->comm_wait.comm->comm.dst_buff == r2->comm_wait.comm->comm.dst_buff)
&& r1->comm_wait.comm->comm.dst_buff == r2->comm_test.comm->comm.dst_buff)
return FALSE;
+ if (r1->call == REQ_COMM_WAIT && r2->call == REQ_COMM_TEST
+ && r1->comm_wait.comm->comm.src_buff != NULL
+ && r1->comm_wait.comm->comm.dst_buff != NULL
+ && r2->comm_test.comm->comm.src_buff != NULL
+ && r2->comm_test.comm->comm.dst_buff != NULL
+ && r1->comm_wait.comm->comm.dst_buff != r2->comm_test.comm->comm.src_buff
+ && r1->comm_wait.comm->comm.dst_buff != r2->comm_test.comm->comm.dst_buff
+ && r2->comm_test.comm->comm.dst_buff != r1->comm_wait.comm->comm.src_buff)
+ return FALSE;
+
+ if (r1->call == REQ_COMM_TEST && r2->call == REQ_COMM_WAIT
+ && r1->comm_test.comm->comm.src_buff != NULL
+ && r1->comm_test.comm->comm.dst_buff != NULL
+ && r2->comm_wait.comm->comm.src_buff != NULL
+ && r2->comm_wait.comm->comm.dst_buff != NULL
+ && r1->comm_test.comm->comm.dst_buff != r2->comm_wait.comm->comm.src_buff
+ && r1->comm_test.comm->comm.dst_buff != r2->comm_wait.comm->comm.dst_buff
+ && r2->comm_wait.comm->comm.dst_buff != r1->comm_test.comm->comm.src_buff)
+ return FALSE;
+
return TRUE;
}
-char *MC_request_to_string(smx_req_t req)
+static char* pointer_to_string(void* pointer) {
+
+ if (XBT_LOG_ISENABLED(mc_request, xbt_log_priority_verbose))
+ return bprintf("%p", pointer);
+
+ return xbt_strdup("(verbose only)");
+}
+
+char *MC_request_to_string(smx_req_t req, int value)
{
- char *type = NULL, *args = NULL, *str = NULL;
+ char *type = NULL, *args = NULL, *str = NULL, *p = NULL;
smx_action_t act = NULL;
size_t size = 0;
-
+
switch(req->call){
case REQ_COMM_ISEND:
- type = bprintf("iSend");
- args = bprintf("src=%s, buff=%p, size=%zu", req->issuer->name,
- req->comm_isend.src_buff, req->comm_isend.src_buff_size);
+ type = xbt_strdup("iSend");
+ p = pointer_to_string(req->comm_isend.src_buff);
+ args = bprintf("src=%s, buff=%s, size=%zu", req->issuer->name,
+ p, req->comm_isend.src_buff_size);
break;
case REQ_COMM_IRECV:
size = req->comm_irecv.dst_buff_size ? *req->comm_irecv.dst_buff_size : 0;
- type = bprintf("iRecv");
- args = bprintf("dst=%s, buff=%p, size=%zu", req->issuer->name,
- req->comm_irecv.dst_buff, size);
+ type = xbt_strdup("iRecv");
+ p = pointer_to_string(req->comm_irecv.dst_buff);
+ args = bprintf("dst=%s, buff=%s, size=%zu", req->issuer->name,
+ p, size);
break;
case REQ_COMM_WAIT:
act = req->comm_wait.comm;
- type = bprintf("Wait");
- args = bprintf("comm=%p [%s(%lu) -> %s(%lu)]", act,
- act->comm.src_proc ? act->comm.src_proc->name : "",
- act->comm.src_proc ? act->comm.src_proc->pid : 0,
- act->comm.dst_proc ? act->comm.dst_proc->name : "",
- act->comm.dst_proc ? act->comm.dst_proc->pid : 0);
+ 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;
- type = bprintf("Test");
- args = bprintf("comm=%p [%s -> %s]", act,
- act->comm.src_proc ? act->comm.src_proc->name : "",
- act->comm.dst_proc ? act->comm.dst_proc->name : "");
+ 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 = bprintf("WaitAny");
- args = bprintf("-");
- /* FIXME: improve output */
+ 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:
- type = bprintf("TestAny");
- args = bprintf("-");
- /* FIXME: improve output */
- break;
+ 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;
str = bprintf("[(%lu)%s] %s (%s)", req->issuer->pid ,req->issuer->name, type, args);
xbt_free(type);
xbt_free(args);
+ xbt_free(p);
return str;
}
return (act->comm.src_proc && act->comm.dst_proc);
break;
+ case REQ_COMM_TESTANY:
+ act = xbt_dynar_get_as(req->comm_testany.comms, idx, smx_action_t);
+ return (act->comm.src_proc && act->comm.dst_proc);
+ break;
+
default:
return TRUE;
}
