X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3c3c79819770d88bfdbd42f5996179290db25a7c..e99158dd85fe789ea5e1a40c29f196fa6c715bcf:/examples/msg/chord/chord.c diff --git a/examples/msg/chord/chord.c b/examples/msg/chord/chord.c index a64b03a158..ef8324c8e3 100644 --- a/examples/msg/chord/chord.c +++ b/examples/msg/chord/chord.c @@ -1,15 +1,16 @@ -/* 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 -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/log.h" #include "xbt/asserts.h" #include "simgrid/modelchecker.h" #include +#include "src/mc/mc_replay.h" // FIXME: this is an internal header /** @addtogroup MSG_examples * @@ -297,7 +298,7 @@ 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; @@ -321,9 +322,8 @@ int node(int argc, char *argv[]) // initialize my node s_node_t node = {0}; - node.id = atoi(argv[1]); - node.stream = - (RngStream)MSG_host_get_property_value(MSG_host_self(), "stream"); + node.id = xbt_str_parse_int(argv[1],"Invalid ID: %s"); + node.stream = (RngStream)MSG_host_get_property_value(MSG_host_self(), "stream"); get_mailbox(node.id, node.mailbox); node.next_finger_to_fix = 0; node.fingers = xbt_new0(s_finger_t, nb_bits); @@ -335,14 +335,14 @@ int node(int argc, char *argv[]) } if (argc == 3) { // first ring - deadline = atof(argv[2]); + deadline = xbt_str_parse_double(argv[2],"Invalid deadline: %s"); create(&node); join_success = 1; - } - else { - int known_id = atoi(argv[2]); + + } else { + int known_id = xbt_str_parse_int(argv[2],"Invalid root ID: %s"); //double sleep_time = atof(argv[3]); - deadline = atof(argv[4]); + deadline = xbt_str_parse_double(argv[4],"Invalid deadline: %s"); /* // sleep before starting @@ -371,8 +371,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){ @@ -713,19 +713,19 @@ static int remote_find_successor(node_t node, int ask_to, int id) XBT_DEBUG("Received a task (%p)", task_received); 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: - // if (MC_is_active()) { - // MC_assert(task_received == task_sent); + // 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: + // if (MC_is_active()) { + // 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 - // brillant victory of the model-checking in the SimGrid community :) + // 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 + // brillant victory of the model-checking in the SimGrid community :) if (task_received != task_sent || ans_data->type != TASK_FIND_SUCCESSOR_ANSWER) { @@ -1025,25 +1025,24 @@ 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)) { int length = strlen("-nb_bits="); if (!strncmp(options[0], "-nb_bits=", length) && strlen(options[0]) > length) { - nb_bits = atoi(options[0] + length); + nb_bits = xbt_str_parse_int(options[0] + length, "Invalid nb_bits parameter: %s"); XBT_DEBUG("Set nb_bits to %d", nb_bits); } else { length = strlen("-timeout="); if (!strncmp(options[0], "-timeout=", length) && strlen(options[0]) > length) { - timeout = atoi(options[0] + length); + timeout = xbt_str_parse_int(options[0] + length, "Invalid timeout parameter: %s"); XBT_DEBUG("Set timeout to %d", timeout); } else { @@ -1069,8 +1068,5 @@ int main(int argc, char *argv[]) chord_exit(); - if (res == MSG_OK) - return 0; - else - return 1; + return res != MSG_OK; }