X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dccd4ef2c80ce2257f823d20d31c6bdfa75bf2ea..49514a74128a35ed4c0ba6dc190d70d35dd9fd7a:/examples/msg/chord/chord.c diff --git a/examples/msg/chord/chord.c b/examples/msg/chord/chord.c index cb89f75856..a64b03a158 100644 --- a/examples/msg/chord/chord.c +++ b/examples/msg/chord/chord.c @@ -16,11 +16,11 @@ * - chord/chord.c: Classical Chord P2P protocol * 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 +76,7 @@ typedef enum { TASK_SUCCESSOR_LEAVING, TASK_PREDECESSOR_LEAVING, TASK_PREDECESSOR_ALIVE, - TASK_PREDECESSOR_ALIVE_ANSWER + TASK_PREDECESSOR_ALIVE_ANSWER } e_task_type_t; /* @@ -92,6 +92,7 @@ typedef struct s_task_data { } s_task_data_t, *task_data_t; static int *powers2; +static xbt_dynar_t host_list; // utility functions static void chord_initialize(void); @@ -132,17 +133,35 @@ static void chord_initialize(void) // compute the powers of 2 once for all powers2 = xbt_new(int, nb_bits); int pow = 1; - int i; + unsigned i; for (i = 0; i < nb_bits; i++) { powers2[i] = pow; pow = pow << 1; } nb_keys = pow; XBT_DEBUG("Sets nb_keys to %d", nb_keys); + + msg_host_t host; + host_list = MSG_hosts_as_dynar(); + xbt_dynar_foreach(host_list, i, host) { + char descr[512]; + RngStream stream; + snprintf(descr, sizeof descr, "RngSream<%s>", MSG_host_get_name(host)); + stream = RngStream_CreateStream(descr); + MSG_host_set_property_value(host, "stream", (char*)stream, NULL); + } } static void chord_exit(void) { + msg_host_t host; + unsigned i; + xbt_dynar_foreach(host_list, i, host) { + RngStream stream = (RngStream)MSG_host_get_property_value(host, "stream"); + RngStream_DeleteStream(&stream); + } + xbt_dynar_free(&host_list); + xbt_free(powers2); } @@ -224,9 +243,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); } @@ -276,7 +295,7 @@ 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()){ periodic_stabilize_delay = 8; @@ -303,6 +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"); get_mailbox(node.id, node.mailbox); node.next_finger_to_fix = 0; node.fingers = xbt_new0(s_finger_t, nb_bits); @@ -573,7 +594,6 @@ static void leave(node_t node) { XBT_DEBUG("Well Guys! I Think it's time for me to quit ;)"); quit_notify(node); - RngStream_DeleteStream(&node->stream); } /** @@ -694,7 +714,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: @@ -702,9 +722,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 || @@ -940,9 +960,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); @@ -991,18 +1011,11 @@ static void check_predecessor(node_t node) */ static void random_lookup(node_t node) { - - int id = 1337; - find_successor(node, id); - - /*** Random lookup disabled for tesh examples ***/ - /*if(node->stream == NULL) - node->stream = RngStream_CreateStream(""); int random_index = RngStream_RandInt (node->stream, 0, nb_bits - 1); int random_id = node->fingers[random_index].id; XBT_DEBUG("Making a lookup request for id %d", random_id); int res = find_successor(node, random_id); - XBT_DEBUG("The successor of node %d is %d", random_id, res);*/ + XBT_DEBUG("The successor of node %d is %d", random_id, res); } @@ -1043,10 +1056,10 @@ int main(int argc, char *argv[]) const char* platform_file = options[0]; const char* application_file = options[1]; - chord_initialize(); - MSG_create_environment(platform_file); + chord_initialize(); + MSG_function_register("node", node); MSG_launch_application(application_file);