return TRUE;
if (r1->issuer == r2->issuer)
- return FALSE;
+ return FALSE;
if(r1->call == SIMCALL_COMM_ISEND && r2->call == SIMCALL_COMM_IRECV)
return FALSE;
if(r1->call == SIMCALL_COMM_IRECV && r2->call == SIMCALL_COMM_ISEND)
return FALSE;
- if( (r1->call == SIMCALL_COMM_ISEND || r1->call == SIMCALL_COMM_IRECV)
+ /*if( (r1->call == SIMCALL_COMM_ISEND || r1->call == SIMCALL_COMM_IRECV)
&& r2->call == SIMCALL_COMM_WAIT){
if(simcall_comm_wait__get__comm(r2)->comm.rdv == NULL)
if(simcall_comm_wait__get__comm(r1)->comm.type == SIMIX_COMM_RECEIVE && r2->call == SIMCALL_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
size_t size = 0;
switch(req->call){
- case SIMCALL_COMM_ISEND:
+ case SIMCALL_COMM_ISEND:
type = xbt_strdup("iSend");
p = pointer_to_string(simcall_comm_isend__get__src_buff(req));
bs = buff_size_to_string(simcall_comm_isend__get__src_buff_size(req));
args = '\0';
break;
+ case SIMCALL_MC_RANDOM:
+ type = xbt_strdup("MC_RANDOM");
+ args = bprintf("%d", value);
+ break;
+
default:
THROW_UNIMPLEMENTED;
}
- str = bprintf("[(%lu)%s] %s (%s)", req->issuer->pid ,req->issuer->name, type, args);
+ if(args != NULL){
+ str = bprintf("[(%lu)%s] %s (%s)", req->issuer->pid ,req->issuer->name, type, args);
+ xbt_free(args);
+ }else{
+ str = bprintf("[(%lu)%s] %s ", req->issuer->pid ,req->issuer->name, type);
+ }
xbt_free(type);
- xbt_free(args);
xbt_free(p);
xbt_free(bs);
return str;
|| req->call == SIMCALL_COMM_WAITANY
|| req->call == SIMCALL_COMM_TEST
|| req->call == SIMCALL_COMM_TESTANY
+ || req->call == SIMCALL_MC_RANDOM
|| req->call == SIMCALL_MC_SNAPSHOT
|| req->call == SIMCALL_MC_COMPARE_SNAPSHOTS;
}
* communication is not ready, it can timeout and won't block.
* On the other hand if it hasn't a timeout, check if the comm is ready.*/
if(simcall_comm_wait__get__timeout(req) >= 0){
- if(_surf_mc_timeout == 1){
+ if(_sg_mc_timeout == 1){
return TRUE;
}else{
act = simcall_comm_wait__get__comm(req);
return FALSE;
}
+
+char *MC_request_get_dot_output(smx_simcall_t req, int value){
+
+ char *str = NULL, *label = NULL;
+ smx_action_t act = NULL;
+
+ switch(req->call){
+ case SIMCALL_COMM_ISEND:
+ label = xbt_strdup("iSend");
+ break;
+
+ case SIMCALL_COMM_IRECV:
+ label = xbt_strdup("iRecv");
+ break;
+
+ case SIMCALL_COMM_WAIT:
+ if(value == -1)
+ label = xbt_strdup("WaitTimeout");
+ else
+ label = xbt_strdup("Wait");
+ break;
+
+ case SIMCALL_COMM_TEST:
+ act = simcall_comm_test__get__comm(req);
+ if(act->comm.src_proc == NULL || act->comm.dst_proc == NULL)
+ label = xbt_strdup("Test FALSE");
+ else
+ label = xbt_strdup("Test TRUE");
+ break;
+
+ case SIMCALL_MC_RANDOM:
+ if(value == 0)
+ label = xbt_strdup("MC_RANDOM (0)");
+ else
+ label = xbt_strdup("MC_RANDOM (1)");
+ break;
+
+ case SIMCALL_MC_SNAPSHOT:
+ label = xbt_strdup("MC_SNAPSHOT");
+ break;
+
+ case SIMCALL_MC_COMPARE_SNAPSHOTS:
+ label = xbt_strdup("MC_COMPARE_SNAPSHOTS");
+ break;
+
+ default:
+ THROW_UNIMPLEMENTED;
+ }
+
+ str = bprintf("label = \"%s\", color = %s", label, colors[req->issuer->pid-1]);
+ xbt_free(label);
+ return str;
+
+}