X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b8d0299b310680eeb9b50d0249fe5bc810aed7e4..a92d7b716f51a53dea7f59db8524d4add713b910:/examples/msg/dht-chord/dht-chord.c diff --git a/examples/msg/dht-chord/dht-chord.c b/examples/msg/dht-chord/dht-chord.c index 29a25a0020..66faa97c3a 100644 --- a/examples/msg/dht-chord/dht-chord.c +++ b/examples/msg/dht-chord/dht-chord.c @@ -43,7 +43,7 @@ static void chord_initialize(void) 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); + MSG_host_set_data(host, stream); } } @@ -52,8 +52,9 @@ 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 stream = (RngStream)MSG_host_get_data(host); RngStream_DeleteStream(&stream); + MSG_host_set_data(host, NULL); } xbt_dynar_free(&host_list); @@ -326,7 +327,6 @@ void quit_notify(node_t node) get_mailbox(node->pred_id, mailbox); task_data_t req_data_s = xbt_new0(s_task_data_t,1); req_data_s->type = TASK_SUCCESSOR_LEAVING; - req_data_s->request_id = node->fingers[0].id; req_data_s->request_id = node->pred_id; get_mailbox(node->id, req_data_s->answer_to); req_data_s->issuer_host_name = MSG_host_get_name(MSG_host_self()); @@ -418,9 +418,9 @@ int remote_find_successor(node_t node, int ask_to, int id) // } // 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 + // This MC_assert is now deactivated 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 :) + // brilliant victory of the model-checking in the SimGrid community :) if (task_received != task_sent || ans_data->type != TASK_FIND_SUCCESSOR_ANSWER) { @@ -563,7 +563,7 @@ void stabilize(node_t node) set_finger(node, 0, candidate_id); } if (successor_id != node->id) { - remote_notify(node, successor_id, node->id); + remote_notify(successor_id, node->id); } } @@ -582,7 +582,7 @@ void notify(node_t node, int predecessor_candidate_id) { } /* Notifies a remote node that its predecessor may have changed. */ -void remote_notify(node_t node, int notify_id, int predecessor_candidate_id) { +void remote_notify(int notify_id, int predecessor_candidate_id) { task_data_t req_data = xbt_new0(s_task_data_t, 1); req_data->type = TASK_NOTIFY; @@ -712,7 +712,7 @@ static int node(int argc, char *argv[]) // initialize my node s_node_t node = {0}; node.id = xbt_str_parse_int(argv[1],"Invalid ID: %s"); - node.stream = (RngStream)MSG_host_get_property_value(MSG_host_self(), "stream"); + node.stream = (RngStream)MSG_host_get_data(MSG_host_self()); get_mailbox(node.id, node.mailbox); node.next_finger_to_fix = 0; node.fingers = xbt_new0(s_finger_t, nb_bits);