Change dependence function to mimic the one in AVOCS article

[simgrid.git] / src / mc / mc_transition.c

diff --git a/src/mc/mc_transition.c b/src/mc/mc_transition.c
index 3d46e0f..dcc1915 100644 (file)
--- a/src/mc/mc_transition.c
+++ b/src/mc/mc_transition.c
@@ -69,17 +69,16 @@ mc_transition_t MC_trans_waitany_new(xbt_dynar_t comms)
 }
 
 /* Creates a new Random transition */
-mc_transition_t MC_trans_random_new(int min, int max)
+mc_transition_t MC_trans_random_new(int value)
 {
   mc_transition_t trans = xbt_new0(s_mc_transition_t, 1);
 
   trans->type = mc_random;
   trans->process = SIMIX_process_self();
-  trans->random.min = min;
-  trans->random.max = max;
-  trans->random.current_value = min;
-  trans->name = bprintf("[%s][%s] Random (%p)", trans->process->smx_host->name, 
-                        trans->process->name, trans);
+  trans->random.value = value;
+  trans->name = bprintf("[%s][%s] Random %d (%p)", trans->process->smx_host->name, 
+                        trans->process->name, value, trans);
+
   return trans;
 }
 
@@ -190,15 +189,20 @@ void MC_trans_intercept_test(smx_comm_t comm)
  */
 void MC_trans_intercept_waitany(xbt_dynar_t comms)
 {
-  mc_transition_t trans=NULL;
+  unsigned int cursor;
+  mc_transition_t trans = NULL;
   mc_state_t current_state = NULL;
+  smx_comm_t comm = NULL;
+  
   if(!mc_replay_mode){
     MC_SET_RAW_MEM;
-    trans = MC_trans_waitany_new(comms);
     current_state = (mc_state_t) 
       xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack));
-    xbt_setset_set_insert(current_state->created_transitions, trans);
-    xbt_setset_set_insert(current_state->transitions, trans);
+    xbt_dynar_foreach(comms, cursor, comm){ 
+      trans = MC_trans_wait_new(comm);
+      xbt_setset_set_insert(current_state->created_transitions, trans);
+      xbt_setset_set_insert(current_state->transitions, trans);
+    }
     MC_UNSET_RAW_MEM;
   }
   SIMIX_process_yield();
@@ -211,15 +215,18 @@ void MC_trans_intercept_waitany(xbt_dynar_t comms)
  */
 void MC_trans_intercept_random(int min, int max)
 {
+  int i;
   mc_transition_t trans=NULL;
   mc_state_t current_state = NULL;
   if(!mc_replay_mode){
     MC_SET_RAW_MEM;
-    trans = MC_trans_random_new(min, max);
     current_state = (mc_state_t) 
       xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack));
-    xbt_setset_set_insert(current_state->created_transitions, trans);
-    xbt_setset_set_insert(current_state->transitions, trans);
+    for(i=min; i <= max; i++){    
+      trans = MC_trans_random_new(i);
+      xbt_setset_set_insert(current_state->created_transitions, trans);
+      xbt_setset_set_insert(current_state->transitions, trans);
+    }
     MC_UNSET_RAW_MEM;
   }
   SIMIX_process_yield();
@@ -275,7 +282,13 @@ int MC_transition_depend(mc_transition_t t1, mc_transition_t t2)
   if(t1->process == t2->process) 
     return FALSE;
 
-  if(t1->type != t2->type)
+  if(t1->type == mc_isend && t2->type == mc_irecv)
+    return FALSE;
+
+  if(t1->type == mc_irecv && t2->type == mc_isend)
+    return FALSE;
+  
+  if(t1->type == mc_random || t2->type == mc_random)
     return FALSE;
   
   if(t1->type == mc_isend && t2->type == mc_isend && t1->isend.rdv != t2->isend.rdv)
@@ -296,6 +309,6 @@ int MC_transition_depend(mc_transition_t t1, mc_transition_t t2)
      && t1->wait.comm->dst_buff != t2->wait.comm->dst_buff
      && t2->wait.comm->dst_buff != t1->wait.comm->src_buff)
     return FALSE;
-  
+
   return TRUE;
 }
\ No newline at end of file