-/* 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");
TASK_SUCCESSOR_LEAVING,
TASK_PREDECESSOR_LEAVING,
TASK_PREDECESSOR_ALIVE,
- TASK_PREDECESSOR_ALIVE_ANSWER
+ TASK_PREDECESSOR_ALIVE_ANSWER
} e_task_type_t;
/*
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);
}
*/
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;
// 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);
}
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
// 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){
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) {
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);
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 {
chord_exit();
- if (res == MSG_OK)
- return 0;
- else
- return 1;
+ return res != MSG_OK;
}
