Move MSG_parallel_task_create() in msg_task.c.

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

diff --git a/src/mc/mc_dpor.c b/src/mc/mc_dpor.c
index 920ee40..707ed9b 100644 (file)
--- a/src/mc/mc_dpor.c
+++ b/src/mc/mc_dpor.c
@@ -1,10 +1,9 @@
-/* Copyright (c) 2008 Martin Quinson, Cristian Rosa.
-   All rights reserved.                                          */
+/* Copyright (c) 2008-2012. 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. */
 
 
 /* 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 "private.h"
+#include "mc_private.h"

 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_dpor, mc,
                                 "Logging specific to MC DPOR exploration");
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_dpor, mc,
                                 "Logging specific to MC DPOR exploration");


@@ -20,11 +19,10 @@ void MC_dpor_init()
   /* Create the initial state and push it into the exploration stack */
   MC_SET_RAW_MEM;
   initial_state = MC_state_new();
   /* Create the initial state and push it into the exploration stack */
   MC_SET_RAW_MEM;
   initial_state = MC_state_new();

-  xbt_fifo_unshift(mc_stack, initial_state);

   MC_UNSET_RAW_MEM;
 
   MC_UNSET_RAW_MEM;
 

-  DEBUG0("**************************************************");
-  DEBUG0("Initial state");
+  XBT_DEBUG("**************************************************");
+  XBT_DEBUG("Initial state");

 
   /* Wait for requests (schedules processes) */
   MC_wait_for_requests();
 
   /* Wait for requests (schedules processes) */
   MC_wait_for_requests();


@@ -32,55 +30,62 @@ void MC_dpor_init()
   MC_SET_RAW_MEM;
   /* Get an enabled process and insert it in the interleave set of the initial state */
   xbt_swag_foreach(process, simix_global->process_list){
   MC_SET_RAW_MEM;
   /* Get an enabled process and insert it in the interleave set of the initial state */
   xbt_swag_foreach(process, simix_global->process_list){

-    if(SIMIX_process_is_enabled(process)){
+    if(MC_process_is_enabled(process)){

       MC_state_interleave_process(initial_state, process);
       break;
     }
   }
       MC_state_interleave_process(initial_state, process);
       break;
     }
   }

+
+  initial_state->system_state = xbt_new0(s_mc_snapshot_t, 1);
+  MC_take_snapshot(initial_state->system_state);
+
+  xbt_fifo_unshift(mc_stack_safety, initial_state);
+

   MC_UNSET_RAW_MEM;
     
   /* FIXME: Update Statistics 
   MC_UNSET_RAW_MEM;
     
   /* FIXME: Update Statistics 

-  mc_stats->state_size +=
-      xbt_setset_set_size(initial_state->enabled_transitions); */
+     mc_stats->state_size +=
+     xbt_setset_set_size(initial_state->enabled_transitions); */

 }
 
 
 /**
 }
 
 
 /**

- *     \brief Perform the model-checking operation using a depth-first search exploration
+ *   \brief Perform the model-checking operation using a depth-first search exploration

  *         with Dynamic Partial Order Reductions
  */
 void MC_dpor(void)
 {
   char *req_str;
   int value;
  *         with Dynamic Partial Order Reductions
  */
 void MC_dpor(void)
 {
   char *req_str;
   int value;

-  smx_req_t req = NULL;
-  mc_state_t state = NULL, prev_state = NULL, next_state = NULL;
+  smx_simcall_t req = NULL, prev_req = NULL;
+  mc_state_t state = NULL, prev_state = NULL, next_state = NULL, restore_state=NULL;

   smx_process_t process = NULL;
   xbt_fifo_item_t item = NULL;
   smx_process_t process = NULL;
   xbt_fifo_item_t item = NULL;

+  int pos;

 
 

-  while (xbt_fifo_size(mc_stack) > 0) {
+  while (xbt_fifo_size(mc_stack_safety) > 0) {

 
     /* Get current state */
     state = (mc_state_t) 
 
     /* Get current state */
     state = (mc_state_t) 

-      xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack));
+      xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_safety));

 
 

-    DEBUG0("**************************************************");
-    DEBUG3("Exploration detph=%d (state=%p)(%u interleave)",
-           xbt_fifo_size(mc_stack), state,
-           MC_state_interleave_size(state));
+    XBT_DEBUG("**************************************************");
+    XBT_DEBUG("Exploration depth=%d (state=%p)(%u interleave)",
+              xbt_fifo_size(mc_stack_safety), state,
+              MC_state_interleave_size(state));

 
     /* Update statistics */
     mc_stats->visited_states++;
 
     /* If there are processes to interleave and the maximum depth has not been reached
        then perform one step of the exploration algorithm */
 
     /* Update statistics */
     mc_stats->visited_states++;
 
     /* If there are processes to interleave and the maximum depth has not been reached
        then perform one step of the exploration algorithm */

-    if (xbt_fifo_size(mc_stack) < MAX_DEPTH &&
+    if (xbt_fifo_size(mc_stack_safety) < MAX_DEPTH &&

         (req = MC_state_get_request(state, &value))) {
 
       /* Debug information */
       if(XBT_LOG_ISENABLED(mc_dpor, xbt_log_priority_debug)){
         (req = MC_state_get_request(state, &value))) {
 
       /* Debug information */
       if(XBT_LOG_ISENABLED(mc_dpor, xbt_log_priority_debug)){

-        req_str = MC_request_to_string(req);
-        DEBUG2("Execute: %s (%u)", req_str, value);
+        req_str = MC_request_to_string(req, value);
+        XBT_DEBUG("Execute: %s", req_str);

         xbt_free(req_str);
       }
 
         xbt_free(req_str);
       }
 


@@ -88,38 +93,45 @@ void MC_dpor(void)
       mc_stats->executed_transitions++;
 
       /* Answer the request */
       mc_stats->executed_transitions++;
 
       /* Answer the request */

-      SIMIX_request_pre(req, value); /* After this call req is no longer usefull */
+      SIMIX_simcall_pre(req, value); /* After this call req is no longer usefull */

 
       /* Wait for requests (schedules processes) */
       MC_wait_for_requests();
 
       /* Create the new expanded state */
       MC_SET_RAW_MEM;
 
       /* Wait for requests (schedules processes) */
       MC_wait_for_requests();
 
       /* Create the new expanded state */
       MC_SET_RAW_MEM;

-      next_state = MC_state_new();
-      xbt_fifo_unshift(mc_stack, next_state);

 
 

+      next_state = MC_state_new();
+      

       /* Get an enabled process and insert it in the interleave set of the next state */
       xbt_swag_foreach(process, simix_global->process_list){
       /* Get an enabled process and insert it in the interleave set of the next state */
       xbt_swag_foreach(process, simix_global->process_list){

-        if(SIMIX_process_is_enabled(process)){
+        if(MC_process_is_enabled(process)){

           MC_state_interleave_process(next_state, process);
           break;
         }
       }
           MC_state_interleave_process(next_state, process);
           break;
         }
       }

+
+      if(_surf_mc_checkpoint && ((xbt_fifo_size(mc_stack_safety) + 1) % _surf_mc_checkpoint == 0)){
+        next_state->system_state = xbt_new0(s_mc_snapshot_t, 1);
+        MC_take_snapshot(next_state->system_state);
+      }
+
+      xbt_fifo_unshift(mc_stack_safety, next_state);

       MC_UNSET_RAW_MEM;
 
       /* FIXME: Update Statistics
       MC_UNSET_RAW_MEM;
 
       /* FIXME: Update Statistics

-      mc_stats->state_size +=
-          xbt_setset_set_size(next_state->enabled_transitions);*/
+         mc_stats->state_size +=
+         xbt_setset_set_size(next_state->enabled_transitions);*/

 
       /* Let's loop again */
 
       /* The interleave set is empty or the maximum depth is reached, let's back-track */
     } else {
 
       /* Let's loop again */
 
       /* The interleave set is empty or the maximum depth is reached, let's back-track */
     } else {

-      DEBUG0("There are no more processes to interleave.");
+      XBT_DEBUG("There are no more processes to interleave.");

 
       /* Trash the current state, no longer needed */
       MC_SET_RAW_MEM;
 
       /* Trash the current state, no longer needed */
       MC_SET_RAW_MEM;

-      xbt_fifo_shift(mc_stack);
+      xbt_fifo_shift(mc_stack_safety);

       MC_state_delete(state);
       MC_UNSET_RAW_MEM;
 
       MC_state_delete(state);
       MC_UNSET_RAW_MEM;
 


@@ -136,34 +148,62 @@ void MC_dpor(void)
          (from it's predecesor state), depends on any other previous request 
          executed before it. If it does then add it to the interleave set of the
          state that executed that previous request. */
          (from it's predecesor state), depends on any other previous request 
          executed before it. If it does then add it to the interleave set of the
          state that executed that previous request. */

-      while ((state = xbt_fifo_shift(mc_stack)) != NULL) {
+      while ((state = xbt_fifo_shift(mc_stack_safety)) != NULL) {

         req = MC_state_get_internal_request(state);
         req = MC_state_get_internal_request(state);

-        xbt_fifo_foreach(mc_stack, item, prev_state, mc_state_t) {
+        xbt_fifo_foreach(mc_stack_safety, item, prev_state, mc_state_t) {

           if(MC_request_depend(req, MC_state_get_internal_request(prev_state))){
             if(XBT_LOG_ISENABLED(mc_dpor, xbt_log_priority_debug)){
           if(MC_request_depend(req, MC_state_get_internal_request(prev_state))){
             if(XBT_LOG_ISENABLED(mc_dpor, xbt_log_priority_debug)){

-              DEBUG0("Dependent Transitions:");
-              req_str = MC_request_to_string(MC_state_get_executed_request(prev_state, &value));
-              DEBUG2("%s (state=%p)", req_str, prev_state);
+              XBT_DEBUG("Dependent Transitions:");
+              prev_req = MC_state_get_executed_request(prev_state, &value);
+              req_str = MC_request_to_string(prev_req, value);
+              XBT_DEBUG("%s (state=%p)", req_str, prev_state);

               xbt_free(req_str);
               xbt_free(req_str);

-              req_str = MC_request_to_string(MC_state_get_executed_request(state, &value));
-              DEBUG2("%s (state=%p)", req_str, state);
+              prev_req = MC_state_get_executed_request(state, &value);
+              req_str = MC_request_to_string(prev_req, value);
+              XBT_DEBUG("%s (state=%p)", req_str, state);

               xbt_free(req_str);              
             }
 
             if(!MC_state_process_is_done(prev_state, req->issuer))
               MC_state_interleave_process(prev_state, req->issuer);
             else
               xbt_free(req_str);              
             }
 
             if(!MC_state_process_is_done(prev_state, req->issuer))
               MC_state_interleave_process(prev_state, req->issuer);
             else

-              DEBUG1("Process %p is in done set", req->issuer);
+              XBT_DEBUG("Process %p is in done set", req->issuer);

 
             break;
           }
         }
         if (MC_state_interleave_size(state)) {
           /* We found a back-tracking point, let's loop */
 
             break;
           }
         }
         if (MC_state_interleave_size(state)) {
           /* We found a back-tracking point, let's loop */

-          xbt_fifo_unshift(mc_stack, state);
-          DEBUG1("Back-tracking to depth %d", xbt_fifo_size(mc_stack));
-          MC_UNSET_RAW_MEM;
-          MC_replay(mc_stack);
+          if(_surf_mc_checkpoint){
+            if(state->system_state != NULL){
+              MC_restore_snapshot(state->system_state);
+              xbt_fifo_unshift(mc_stack_safety, state);
+              XBT_DEBUG("Back-tracking to depth %d", xbt_fifo_size(mc_stack_safety));
+              MC_UNSET_RAW_MEM;
+            }else{
+              pos = xbt_fifo_size(mc_stack_safety);
+              item = xbt_fifo_get_first_item(mc_stack_safety);
+              while(pos>0){
+                restore_state = (mc_state_t) xbt_fifo_get_item_content(item);
+                if(restore_state->system_state != NULL){
+                  break;
+                }else{
+                  item = xbt_fifo_get_next_item(item);
+                  pos--;
+                }
+              }
+              MC_restore_snapshot(restore_state->system_state);
+              xbt_fifo_unshift(mc_stack_safety, state);
+              XBT_DEBUG("Back-tracking to depth %d", xbt_fifo_size(mc_stack_safety));
+              MC_UNSET_RAW_MEM;
+              MC_replay(mc_stack_safety, pos);
+            }
+          }else{
+            xbt_fifo_unshift(mc_stack_safety, state);
+            XBT_DEBUG("Back-tracking to depth %d", xbt_fifo_size(mc_stack_safety));
+            MC_UNSET_RAW_MEM;
+            MC_replay(mc_stack_safety, -1);
+          }

           break;
         } else {
           MC_state_delete(state);
           break;
         } else {
           MC_state_delete(state);


@@ -172,6 +212,11 @@ void MC_dpor(void)
       MC_UNSET_RAW_MEM;
     }
   }
       MC_UNSET_RAW_MEM;
     }
   }

+  MC_print_statistics(mc_stats);

   MC_UNSET_RAW_MEM;
   return;
 }
   MC_UNSET_RAW_MEM;
   return;
 }

+
+
+
+