X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/18c57b27dd71ee7839c6a90368c845886a87d638..e0300cbd373040c590de77e64cc6c6e5fc3c28bb:/src/mc/mc_state.c

diff --git a/src/mc/mc_state.c b/src/mc/mc_state.c
index d8604de9b6..2331919167 100644
--- a/src/mc/mc_state.c
+++ b/src/mc/mc_state.c
@@ -1,33 +1,39 @@
+/* Copyright (c) 2008-2014. The 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. */
 
-#include "../simix/private.h"
+#include <assert.h>
+
+#include "../simix/smx_private.h"
 #include "xbt/fifo.h"
-#include "private.h"
+#include "mc_state.h"
+#include "mc_request.h"
+#include "mc_private.h"
+#include "mc_comm_pattern.h"
+#include "mc_smx.h"
 
 /**
  * \brief Creates a state data structure used by the exploration algorithm
  */
-mc_state_t MC_state_new(void)
+mc_state_t MC_state_new()
 {
-  mc_state_t state = NULL;
-  
-  state = xbt_new0(s_mc_state_t, 1);
-  state->max_pid = simix_process_maxpid;
+  mc_state_t state = xbt_new0(s_mc_state_t, 1);
+  state->max_pid = MC_smx_get_maxpid();
   state->proc_status = xbt_new0(s_mc_procstate_t, state->max_pid);
-  
-  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);
-  
-  //mc_stats->expanded_states++;
+  state->system_state = NULL;
+  state->num = ++mc_stats->expanded_states;
+  state->in_visited_states = 0;
+  state->incomplete_comm_pattern = NULL;
+  /* Stateful model checking */
+  if((_sg_mc_checkpoint > 0 && (mc_stats->expanded_states % _sg_mc_checkpoint == 0)) ||  _sg_mc_termination){
+    state->system_state = MC_take_snapshot(state->num);
+    if(_sg_mc_comms_determinism || _sg_mc_send_determinism){
+      MC_state_copy_incomplete_communications_pattern(state);
+      MC_state_copy_index_communications_pattern(state);
+    }
+  }
   return state;
 }
 
@@ -35,79 +41,119 @@ mc_state_t MC_state_pair_new(void)
  * \brief Deletes a state data structure
  * \param trans The state to be deleted
  */
-void MC_state_delete(mc_state_t state)
-{
+void MC_state_delete(mc_state_t state, int free_snapshot){
+  if (state->system_state && free_snapshot){
+    MC_free_snapshot(state->system_state);
+  }
+  if(_sg_mc_comms_determinism || _sg_mc_send_determinism){
+    xbt_free(state->index_comm);
+    xbt_free(state->incomplete_comm_pattern);
+  }
   xbt_free(state->proc_status);
   xbt_free(state);
 }
 
 void MC_state_interleave_process(mc_state_t state, smx_process_t process)
 {
+  assert(state);
   state->proc_status[process->pid].state = MC_INTERLEAVE;
   state->proc_status[process->pid].interleave_count = 0;
 }
 
+void MC_state_remove_interleave_process(mc_state_t state, smx_process_t process)
+{
+  if (state->proc_status[process->pid].state == MC_INTERLEAVE)
+    state->proc_status[process->pid].state = MC_DONE;
+}
+
 unsigned int MC_state_interleave_size(mc_state_t state)
 {
-  unsigned int i, size=0;
+  unsigned int i, size = 0;
 
-  for(i=0; i < state->max_pid; i++){
-    if(state->proc_status[i].state == MC_INTERLEAVE)
+  for (i = 0; i < state->max_pid; i++) {
+    if ((state->proc_status[i].state == MC_INTERLEAVE)
+        || (state->proc_status[i].state == MC_MORE_INTERLEAVE))
       size++;
   }
 
   return size;
 }
 
-int MC_state_process_is_done(mc_state_t state, smx_process_t process){
+int MC_state_process_is_done(mc_state_t state, smx_process_t process)
+{
   return state->proc_status[process->pid].state == MC_DONE ? TRUE : FALSE;
 }
 
-void MC_state_set_executed_request(mc_state_t state, smx_simcall_t req, int value)
+void MC_state_set_executed_request(mc_state_t state, smx_simcall_t req,
+                                   int value)
 {
   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
    * function. */
-  switch(req->call){
-    case REQ_COMM_WAITANY:
-      state->internal_req.call = REQ_COMM_WAIT;
-      state->internal_req.issuer = req->issuer;
-      state->internal_comm = *xbt_dynar_get_as(req->comm_waitany.comms, value, smx_action_t);
-      state->internal_req.comm_wait.comm = &state->internal_comm;
-      state->internal_req.comm_wait.timeout = 0;
-      break;
-
-    case REQ_COMM_TESTANY:
-      state->internal_req.call = REQ_COMM_TEST;
-      state->internal_req.issuer = req->issuer;
-
-      if(value > 0)
-        state->internal_comm = *xbt_dynar_get_as(req->comm_testany.comms, value, smx_action_t);
-
-      state->internal_req.comm_wait.comm = &state->internal_comm;
-      state->internal_req.comm_test.result = value;
-      break;
-
-    case REQ_COMM_WAIT:
-      state->internal_req = *req;
-      state->internal_comm = *(req->comm_wait.comm);
-      state->executed_req.comm_wait.comm = &state->internal_comm;
-      state->internal_req.comm_wait.comm = &state->internal_comm;
-      break;
-
-    case REQ_COMM_TEST:
-      state->internal_req = *req;
-      state->internal_comm = *req->comm_test.comm;
-      state->executed_req.comm_test.comm = &state->internal_comm;
-      state->internal_req.comm_test.comm = &state->internal_comm;
-      break;
-
-    default:
-      state->internal_req = *req;
-      break;
+  switch (req->call) {
+  case SIMCALL_COMM_WAITANY:
+    state->internal_req.call = SIMCALL_COMM_WAIT;
+    state->internal_req.issuer = req->issuer;
+    MC_process_read_dynar_element(&mc_model_checker->process,
+      &state->internal_comm, simcall_comm_waitany__get__comms(req),
+      sizeof(state->internal_comm));
+    simcall_comm_wait__set__comm(&state->internal_req, &state->internal_comm);
+    simcall_comm_wait__set__timeout(&state->internal_req, 0);
+    break;
+
+  case SIMCALL_COMM_TESTANY:
+    state->internal_req.call = SIMCALL_COMM_TEST;
+    state->internal_req.issuer = req->issuer;
+
+    if (value > 0)
+      // FIXME, read from remote process
+        MC_process_read_dynar_element(&mc_model_checker->process,
+          &state->internal_comm, simcall_comm_testany__get__comms(req),
+          sizeof(state->internal_comm));
+
+    simcall_comm_test__set__comm(&state->internal_req, &state->internal_comm);
+    simcall_comm_test__set__result(&state->internal_req, value);
+    break;
+
+  case SIMCALL_COMM_WAIT:
+    state->internal_req = *req;
+    MC_process_read_simple(&mc_model_checker->process, &state->internal_comm ,
+      simcall_comm_wait__get__comm(req), sizeof(state->internal_comm));
+    simcall_comm_wait__set__comm(&state->executed_req, &state->internal_comm);
+    simcall_comm_wait__set__comm(&state->internal_req, &state->internal_comm);
+    break;
+
+  case SIMCALL_COMM_TEST:
+    state->internal_req = *req;
+    MC_process_read_simple(&mc_model_checker->process, &state->internal_comm,
+      simcall_comm_test__get__comm(req), sizeof(state->internal_comm));
+    simcall_comm_test__set__comm(&state->executed_req, &state->internal_comm);
+    simcall_comm_test__set__comm(&state->internal_req, &state->internal_comm);
+    break;
+
+  case SIMCALL_MC_RANDOM:
+    state->internal_req = *req;
+    int random_max = simcall_mc_random__get__max(req);
+    if (value != random_max) {
+      MC_EACH_SIMIX_PROCESS(process,
+        procstate = &state->proc_status[process->pid];
+        const smx_process_t issuer = MC_smx_simcall_get_issuer(req);
+        if (process->pid == issuer->pid) {
+          procstate->state = MC_MORE_INTERLEAVE;
+          break;
+        }
+      );
+    }
+    break;
+
+  default:
+    state->internal_req = *req;
+    break;
   }
 }
 
@@ -127,69 +173,99 @@ 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;
+  smx_synchro_t act = NULL;
 
-  xbt_swag_foreach(process, simix_global->process_list){
+  MC_EACH_SIMIX_PROCESS(process,
     procstate = &state->proc_status[process->pid];
 
-    if(procstate->state == MC_INTERLEAVE){
-      if(MC_process_is_enabled(process)){
-        switch(process->simcall.call){
-          case REQ_COMM_WAITANY:
-            *value = -1;
-            while(procstate->interleave_count < xbt_dynar_length(process->simcall.comm_waitany.comms)){
-              if(MC_request_is_enabled_by_idx(&process->simcall, procstate->interleave_count++)){
-                *value = procstate->interleave_count-1;
-                break;
-              }
+    if (procstate->state != MC_INTERLEAVE
+        && procstate->state != MC_MORE_INTERLEAVE)
+        continue;
+    if (!MC_process_is_enabled(process))
+      continue;
+
+    switch (process->simcall.call) {
+        case SIMCALL_COMM_WAITANY:
+          *value = -1;
+          while (procstate->interleave_count <
+                MC_process_read_dynar_length(&mc_model_checker->process,
+                  simcall_comm_waitany__get__comms(&process->simcall))) {
+            if (MC_request_is_enabled_by_idx
+                (&process->simcall, procstate->interleave_count++)) {
+              *value = procstate->interleave_count - 1;
+              break;
             }
+          }
 
-            if(procstate->interleave_count >= xbt_dynar_length(process->simcall.comm_waitany.comms))
-              procstate->state = MC_DONE;
-
-            if(*value != -1)
-              return &process->simcall;
+          if (procstate->interleave_count >=
+              MC_process_read_dynar_length(&mc_model_checker->process,
+                simcall_comm_waitany__get__comms(&process->simcall)))
+            procstate->state = MC_DONE;
 
-            break;
+          if (*value != -1)
+            return &process->simcall;
 
-          case REQ_COMM_TESTANY:
-            start_count = procstate->interleave_count;
-            *value = -1;
-            while(procstate->interleave_count < xbt_dynar_length(process->simcall.comm_testany.comms)){
-              if(MC_request_is_enabled_by_idx(&process->simcall, procstate->interleave_count++)){
-                *value = procstate->interleave_count - 1;
-                break;
-              }
+          break;
+
+        case SIMCALL_COMM_TESTANY:
+          start_count = procstate->interleave_count;
+          *value = -1;
+          while (procstate->interleave_count <
+                  MC_process_read_dynar_length(&mc_model_checker->process,
+                    simcall_comm_testany__get__comms(&process->simcall))) {
+            if (MC_request_is_enabled_by_idx
+                (&process->simcall, procstate->interleave_count++)) {
+              *value = procstate->interleave_count - 1;
+              break;
             }
+          }
 
-            if(procstate->interleave_count >= xbt_dynar_length(process->simcall.comm_testany.comms))
-              procstate->state = MC_DONE;
+          if (procstate->interleave_count >=
+              MC_process_read_dynar_length(&mc_model_checker->process,
+                simcall_comm_testany__get__comms(&process->simcall)))
+            procstate->state = MC_DONE;
+
+          if (*value != -1 || start_count == 0)
+            return &process->simcall;
 
-            if(*value != -1 || start_count == 0)
-              return &process->simcall;
+          break;
 
-            break;
+        case SIMCALL_COMM_WAIT:
+          act = simcall_comm_wait__get__comm(&process->simcall);
 
-          case REQ_COMM_WAIT:
-            if(process->simcall.comm_wait.comm->comm.src_proc
-               && process->simcall.comm_wait.comm->comm.dst_proc){
+          if (act->comm.src_proc && act->comm.dst_proc) {
+            *value = 0;
+          } else {
+            if (act->comm.src_proc == NULL && act->comm.type == SIMIX_COMM_READY
+                && act->comm.detached == 1)
               *value = 0;
-            }else{
+            else
               *value = -1;
-            }
-            procstate->state = MC_DONE;
-            return &process->simcall;
+          }
+          procstate->state = MC_DONE;
+          return &process->simcall;
 
-            break;
+          break;
 
-          default:
-            procstate->state = MC_DONE;
+        case SIMCALL_MC_RANDOM:
+          if (procstate->state == MC_INTERLEAVE)
             *value = 0;
-            return &process->simcall;
-            break;
-        }
-      }
+          else {
+            if (state->req_num < simcall_mc_random__get__max(&process->simcall))
+              *value = state->req_num + 1;
+          }
+          procstate->state = MC_DONE;
+          return &process->simcall;
+          break;
+
+        default:
+          procstate->state = MC_DONE;
+          *value = 0;
+          return &process->simcall;
+          break;
+
     }
-  }
+  );
 
   return NULL;
 }