kill the right XML files

[simgrid.git] / examples / msg / chord / chord.c

diff --git a/examples/msg/chord/chord.c b/examples/msg/chord/chord.c
index 4f58233..21c6a8c 100644 (file)
--- a/examples/msg/chord/chord.c
+++ b/examples/msg/chord/chord.c
@@ -1,26 +1,27 @@
-/* Copyright (c) 2010-2014. The SimGrid Team.
+/* Copyright (c) 2010-2015. 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 <stdio.h>
-#include "msg/msg.h"
+#include "simgrid/msg.h"
 #include "xbt/log.h"
 #include "xbt/asserts.h"
 #include "simgrid/modelchecker.h"
 #include <xbt/RngStream.h>
+#include "src/mc/mc_replay.h" // FIXME: this is an internal header
 
 /** @addtogroup MSG_examples
  *
  *  - <b>chord/chord.c: Classical Chord P2P protocol</b>
  *    This example implements the well known Chord P2P protocol. Its
  *    main advantage is that it constitute a fully working non-trivial
- *    example. In addition, its implementation is rather efficient, as 
+ *    example. In addition, its implementation is rather efficient, as
  *    demonstrated in http://hal.inria.fr/inria-00602216/
  */
 
- 
+
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_chord,
                              "Messages specific for this msg example");
 
@@ -76,7 +77,7 @@ typedef enum {
   TASK_SUCCESSOR_LEAVING,
   TASK_PREDECESSOR_LEAVING,
   TASK_PREDECESSOR_ALIVE,
-  TASK_PREDECESSOR_ALIVE_ANSWER  
+  TASK_PREDECESSOR_ALIVE_ANSWER
 } e_task_type_t;
 
 /*
@@ -243,9 +244,9 @@ static void print_finger_table(node_t node)
   if (XBT_LOG_ISENABLED(msg_chord, xbt_log_priority_verbose)) {
     int i;
     XBT_VERB("My finger table:");
-    XBT_VERB("Start | Succ ");
+    XBT_VERB("Start | Succ");
     for (i = 0; i < nb_bits; i++) {
-      XBT_VERB(" %3d  | %3d ", (node->id + powers2[i]) % nb_keys, node->fingers[i].id);
+      XBT_VERB(" %3d  | %3d", (node->id + powers2[i]) % nb_keys, node->fingers[i].id);
     }
     XBT_VERB("Predecessor: %d", node->pred_id);
   }
@@ -295,9 +296,9 @@ static void set_predecessor(node_t node, int predecessor_id)
  */
 int node(int argc, char *argv[])
 {
-  
+
   /* Reduce the run size for the MC */
-  if(MC_is_active()){
+  if(MC_is_active() || MC_record_replay_is_active()){
     periodic_stabilize_delay = 8;
     periodic_fix_fingers_delay = 8;
     periodic_check_predecessor_delay = 8;
@@ -371,8 +372,8 @@ int node(int argc, char *argv[])
 
         // no task was received: make some periodic calls
 
-        if(MC_is_active()){
-          if(!MC_visited_reduction() && no_op){
+        if(MC_is_active() || MC_record_replay_is_active()){
+          if(MC_is_active() && !MC_visited_reduction() && no_op){
               MC_cut();
           }
           if(listen == 0 && (sub_protocol = MC_random(0, 4)) > 0){
@@ -714,7 +715,7 @@ static int remote_find_successor(node_t node, int ask_to, int id)
         task_data_t ans_data = MSG_task_get_data(task_received);
 
        // Once upon a time, our code assumed that here, task_received != task_sent all the time
-       // 
+       //
        // This assumption is wrong (as messages from differing round can interleave), leading to a bug in our code.
        // We failed to find this bug directly, as it only occured on large platforms, leading to hardly usable traces.
        // Instead, we used the model-checker to track down the issue by adding the following test here in the code:
@@ -722,9 +723,9 @@ static int remote_find_successor(node_t node, int ask_to, int id)
        //      MC_assert(task_received == task_sent);
         //   }
        // That explained the bug in a snap, with a very cool example and everything.
-       // 
+       //
        // This MC_assert is now desactivated as the case is now properly handled in our code and we don't want the
-       //   MC to fail any further under that condition, but this comment is here to as a memorial for this first 
+       //   MC to fail any further under that condition, but this comment is here to as a memorial for this first
        //   brillant victory of the model-checking in the SimGrid community :)
 
         if (task_received != task_sent ||
@@ -960,9 +961,9 @@ static void check_predecessor(node_t node)
 
   msg_task_t task_sent = MSG_task_create(NULL, COMP_SIZE, COMM_SIZE, req_data);
   XBT_DEBUG("Sending a 'Predecessor Alive' request to my predecessor %d", node->pred_id);
-  
+
   msg_error_t res = MSG_task_send_with_timeout(task_sent, mailbox, timeout);
-  
+
   if (res != MSG_OK) {
     XBT_DEBUG("Failed to send the 'Predecessor Alive' request (task %p) to %d", task_sent, node->pred_id);
     task_free(task_sent);
@@ -1025,11 +1026,10 @@ static void random_lookup(node_t node)
 int main(int argc, char *argv[])
 {
   MSG_init(&argc, argv);
-  if (argc < 3) {
-    printf("Usage: %s [-nb_bits=n] [-timeout=t] platform_file deployment_file\n", argv[0]);
-    printf("example: %s ../msg_platform.xml chord.xml\n", argv[0]);
-    exit(1);
-  }
+  xbt_assert(argc > 2, 
+            "Usage: %s [-nb_bits=n] [-timeout=t] platform_file deployment_file\n"
+            "\tExample: %s ../msg_platform.xml chord.xml\n", 
+            argv[0], argv[0]);
 
   char **options = &argv[1];
   while (!strncmp(options[0], "-", 1)) {
@@ -1069,8 +1069,5 @@ int main(int argc, char *argv[])
 
   chord_exit();
 
-  if (res == MSG_OK)
-    return 0;
-  else
-    return 1;
+  return res != MSG_OK;
 }