Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
[mc] Move comm determinism code in mc_comm_determinism.c
[simgrid.git] / src / mc / mc_state.c
index e9b4b04..8e707b2 100644 (file)
@@ -4,25 +4,40 @@
 /* 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 <assert.h>
+
 #include "../simix/smx_private.h"
 #include "xbt/fifo.h"
 #include "mc_state.h"
 #include "mc_request.h"
 #include "mc_private.h"
+#include "mc_comm_pattern.h"
+#include "mc_smx.h"
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_state, mc,
+                                "Logging specific to MC (state)");
 
 /**
  * \brief Creates a state data structure used by the exploration algorithm
  */
 mc_state_t MC_state_new()
 {
-  mc_state_t state = NULL;
+  mc_state_t state = xbt_new0(s_mc_state_t, 1);
 
-  state = xbt_new0(s_mc_state_t, 1);
-  state->max_pid = simix_process_maxpid;
+  state->max_pid = MC_smx_get_maxpid();
   state->proc_status = xbt_new0(s_mc_procstate_t, state->max_pid);
   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;
 }
 
@@ -30,16 +45,21 @@ mc_state_t MC_state_new()
  * \brief Deletes a state data structure
  * \param trans The state to be deleted
  */
-void MC_state_delete(mc_state_t state)
-{
-  if (state->system_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;
 }
@@ -73,8 +93,8 @@ void MC_state_set_executed_request(mc_state_t state, smx_simcall_t req,
 {
   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
@@ -83,9 +103,9 @@ void MC_state_set_executed_request(mc_state_t state, smx_simcall_t req,
   case SIMCALL_COMM_WAITANY:
     state->internal_req.call = SIMCALL_COMM_WAIT;
     state->internal_req.issuer = req->issuer;
-    state->internal_comm =
-        *xbt_dynar_get_as(simcall_comm_waitany__get__comms(req), value,
-                          smx_synchro_t);
+    MC_process_read_dynar_element(&mc_model_checker->process,
+      &state->internal_comm, simcall_comm_waitany__get__comms(req),
+      value, 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;
@@ -95,9 +115,9 @@ void MC_state_set_executed_request(mc_state_t state, smx_simcall_t req,
     state->internal_req.issuer = req->issuer;
 
     if (value > 0)
-      state->internal_comm =
-          *xbt_dynar_get_as(simcall_comm_testany__get__comms(req), value,
-                            smx_synchro_t);
+        MC_process_read_dynar_element(&mc_model_checker->process,
+          &state->internal_comm, simcall_comm_testany__get__comms(req),
+          value, sizeof(state->internal_comm));
 
     simcall_comm_test__set__comm(&state->internal_req, &state->internal_comm);
     simcall_comm_test__set__result(&state->internal_req, value);
@@ -105,28 +125,32 @@ void MC_state_set_executed_request(mc_state_t state, smx_simcall_t req,
 
   case SIMCALL_COMM_WAIT:
     state->internal_req = *req;
-    state->internal_comm = *(simcall_comm_wait__get__comm(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;
-    state->internal_comm = *simcall_comm_test__get__comm(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;
-    if (value != simcall_mc_random__get__max(req)) {
-      xbt_swag_foreach(process, simix_global->process_list) {
-        procstate = &state->proc_status[process->pid];
-        if (process->pid == req->issuer->pid) {
+    int random_max = simcall_mc_random__get__max(req);
+    if (value != random_max) {
+      MC_EACH_SIMIX_PROCESS(process,
+        mc_procstate_t 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;
 
@@ -147,101 +171,109 @@ smx_simcall_t MC_state_get_internal_request(mc_state_t state)
   return &state->internal_req;
 }
 
-smx_simcall_t MC_state_get_request(mc_state_t state, int *value)
+static inline smx_simcall_t MC_state_get_request_for_process(
+  mc_state_t state, int*value, smx_process_t process)
 {
-  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) {
-    procstate = &state->proc_status[process->pid];
-
-    if (procstate->state == MC_INTERLEAVE
-        || procstate->state == MC_MORE_INTERLEAVE) {
-      if (MC_process_is_enabled(process)) {
-        switch (process->simcall.call) {
-        case SIMCALL_COMM_WAITANY:
-          *value = -1;
-          while (procstate->interleave_count <
-                 xbt_dynar_length(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;
-            }
+  mc_procstate_t procstate = &state->proc_status[process->pid];
+
+  if (procstate->state != MC_INTERLEAVE
+      && procstate->state != MC_MORE_INTERLEAVE)
+      return NULL;
+  if (!MC_process_is_enabled(process))
+    return NULL;
+
+  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(simcall_comm_waitany__get__comms
-                               (&process->simcall)))
-            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 SIMCALL_COMM_TESTANY:
-          start_count = procstate->interleave_count;
-          *value = -1;
-          while (procstate->interleave_count <
-                 xbt_dynar_length(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;
-            }
+        break;
+
+      case SIMCALL_COMM_TESTANY: {
+        unsigned 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(simcall_comm_testany__get__comms
-                               (&process->simcall)))
-            procstate->state = MC_DONE;
-
-          if (*value != -1 || start_count == 0)
-            return &process->simcall;
-
-          break;
-
-        case SIMCALL_COMM_WAIT:
-          act = simcall_comm_wait__get__comm(&process->simcall);
-          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
-              *value = -1;
-          }
+        if (procstate->interleave_count >=
+            MC_process_read_dynar_length(&mc_model_checker->process,
+              simcall_comm_testany__get__comms(&process->simcall)))
           procstate->state = MC_DONE;
-          return &process->simcall;
-
-          break;
 
-        case SIMCALL_MC_RANDOM:
-          if (procstate->state == MC_INTERLEAVE)
-            *value = 0;
-          else {
-            if (state->req_num < simcall_mc_random__get__max(&process->simcall))
-              *value = state->req_num + 1;
-          }
-          procstate->state = MC_DONE;
+        if (*value != -1 || start_count == 0)
           return &process->simcall;
-          break;
 
-        default:
-          procstate->state = MC_DONE;
+        break;
+      }
+
+      case SIMCALL_COMM_WAIT: {
+        smx_synchro_t remote_act = simcall_comm_wait__get__comm(&process->simcall);
+        s_smx_synchro_t act;
+        MC_process_read_simple(&mc_model_checker->process,
+          &act, remote_act, sizeof(act));
+        if (act.comm.src_proc && act.comm.dst_proc) {
           *value = 0;
-          return &process->simcall;
-          break;
+        } else {
+          if (act.comm.src_proc == NULL && act.comm.type == SIMIX_COMM_READY
+              && act.comm.detached == 1)
+            *value = 0;
+          else
+            *value = -1;
         }
+        procstate->state = MC_DONE;
+        return &process->simcall;
       }
-    }
+
+      case SIMCALL_MC_RANDOM:
+        if (procstate->state == MC_INTERLEAVE)
+          *value = simcall_mc_random__get__min(&process->simcall);
+        else {
+          if (state->req_num < simcall_mc_random__get__max(&process->simcall))
+            *value = state->req_num + 1;
+        }
+        procstate->state = MC_DONE;
+        return &process->simcall;
+
+      default:
+        procstate->state = MC_DONE;
+        *value = 0;
+        return &process->simcall;
   }
+  return NULL;
+}
+
+smx_simcall_t MC_state_get_request(mc_state_t state, int *value)
+{
+  smx_process_t process = NULL;
+  MC_EACH_SIMIX_PROCESS(process,
+    smx_simcall_t res = MC_state_get_request_for_process(state, value, process);
+    if (res)
+      return res;
+  );
 
   return NULL;
 }