X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5a4767e64e45de2c17e9bbdcdf9c8588dbce80b0..8847b375a11af83a841c0964292a2fe9ee9a0fff:/src/mc/mc_state.c

diff --git a/src/mc/mc_state.c b/src/mc/mc_state.c
index d43a6bc7a2..59cca4e6cc 100644
--- a/src/mc/mc_state.c
+++ b/src/mc/mc_state.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2012 Da SimGrid Team. All rights reserved.            */
+/* Copyright (c) 2008-2013 Da SimGrid Team. All rights reserved.            */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -18,20 +18,8 @@ mc_state_t MC_state_new()
   state->max_pid = simix_process_maxpid;
   state->proc_status = xbt_new0(s_mc_procstate_t, state->max_pid);
   state->system_state = NULL;
-
-  mc_stats->expanded_states++;
-  return state;
-}
-
-mc_state_t MC_state_pair_new(void)
-{
-  mc_state_t state = NULL;
-  
-  state = xbt_new0(s_mc_state_t, 1);
-  state->max_pid = simix_process_maxpid;
-  state->proc_status = xbt_new0(s_mc_procstate_t, state->max_pid);
+  state->num = ++mc_stats->expanded_states;
   
-  //mc_stats->expanded_states++;
   return state;
 }
 
@@ -64,7 +52,7 @@ unsigned int MC_state_interleave_size(mc_state_t state)
   unsigned int i, size=0;
 
   for(i=0; i < state->max_pid; i++){
-    if(state->proc_status[i].state == MC_INTERLEAVE)
+    if((state->proc_status[i].state == MC_INTERLEAVE) || (state->proc_status[i].state == MC_MORE_INTERLEAVE))
       size++;
   }
 
@@ -79,6 +67,8 @@ void MC_state_set_executed_request(mc_state_t state, smx_simcall_t req, int valu
 {
   state->executed_req = *req;
   state->req_num = value;
+  smx_process_t process = NULL;
+  mc_procstate_t procstate = NULL;
 
   /* The waitany and testany request are transformed into a wait or test request over the
    * corresponding communication action so it can be treated later by the dependence
@@ -120,6 +110,15 @@ void MC_state_set_executed_request(mc_state_t state, smx_simcall_t req, int valu
     case SIMCALL_MC_RANDOM:
       state->internal_req = *req;
       simcall_mc_random__set__result(&state->internal_req, value);
+      if(value == 0){
+        xbt_swag_foreach(process, simix_global->process_list){
+          procstate = &state->proc_status[process->pid];
+          if(process->pid == req->issuer->pid){
+            procstate->state = MC_MORE_INTERLEAVE;  
+            break;
+          }        
+        }
+      }
       break;
 
     default:
@@ -127,7 +126,7 @@ void MC_state_set_executed_request(mc_state_t state, smx_simcall_t req, int valu
       break;
   }
 }
-
+ 
 smx_simcall_t MC_state_get_executed_request(mc_state_t state, int *value)
 {
   *value = state->req_num;
@@ -144,18 +143,11 @@ smx_simcall_t MC_state_get_request(mc_state_t state, int *value)
   smx_process_t process = NULL;
   mc_procstate_t procstate = NULL;
   unsigned int start_count;
-  int min, max;
-
-  static int first = 0;
-  if(first == 0){
-    srand(987654321);
-    first = 1;
-  }
 
   xbt_swag_foreach(process, simix_global->process_list){
     procstate = &state->proc_status[process->pid];
 
-    if(procstate->state == MC_INTERLEAVE){
+    if(procstate->state == MC_INTERLEAVE || procstate->state == MC_MORE_INTERLEAVE){
       if(MC_process_is_enabled(process)){
         switch(process->simcall.call){
           case SIMCALL_COMM_WAITANY:
@@ -206,9 +198,10 @@ smx_simcall_t MC_state_get_request(mc_state_t state, int *value)
             break;
 
           case SIMCALL_MC_RANDOM:
-            min = simcall_mc_random__get__min(&process->simcall);
-            max = simcall_mc_random__get__max(&process->simcall);
-            *value = (int)((rand() % ((max-min)+1)) + min);
+            if(procstate->state == MC_INTERLEAVE)
+              *value = 0;
+            else
+              *value = 1;
             procstate->state = MC_DONE;
             return &process->simcall;
             break;