X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ff2bf6c94637f28c0c219e9adc61a11e78be1900..7049f373e589ff9ffa336720a789f82ef8930aa7:/examples/msg/app-chainsend/peer.c diff --git a/examples/msg/app-chainsend/peer.c b/examples/msg/app-chainsend/peer.c index 70e7673bfb..1201149f02 100644 --- a/examples/msg/app-chainsend/peer.c +++ b/examples/msg/app-chainsend/peer.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2014. The SimGrid Team. +/* Copyright (c) 2012-2014, 2016-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -19,9 +19,8 @@ void peer_init_chain(peer_t peer, message_t msg) static void peer_forward_msg(peer_t peer, message_t msg) { msg_task_t task = task_message_data_new(NULL, msg->data_length); - msg_comm_t comm = NULL; XBT_DEBUG("Sending (isend) from %s into mailbox %s", peer->me, peer->next); - comm = MSG_task_isend(task, peer->next); + msg_comm_t comm = MSG_task_isend(task, peer->next); queue_pending_connection(comm, peer->pending_sends); } @@ -29,18 +28,18 @@ int peer_execute_task(peer_t peer, msg_task_t task) { int done = 0; message_t msg = MSG_task_get_data(task); - - XBT_DEBUG("Peer %s got message of type %d\n", peer->me, msg->type); + + XBT_DEBUG("Peer %s got message of type %u\n", peer->me, msg->type); if (msg->type == MESSAGE_BUILD_CHAIN) peer_init_chain(peer, msg); - if (msg->type == MESSAGE_SEND_DATA){ - xbt_assert(peer->init, "peer_execute_task() failed: got msg_type %d before initialization", msg->type); + else if (msg->type == MESSAGE_SEND_DATA) { + xbt_assert(peer->init, "peer_execute_task() failed: got msg_type %u before initialization", msg->type); if (peer->next != NULL) peer_forward_msg(peer, msg); peer->pieces++; peer->bytes += msg->data_length; if (peer->pieces >= peer->total_pieces) { - XBT_DEBUG("%d pieces receieved", peer->pieces); + XBT_DEBUG("%d pieces received", peer->pieces); done = 1; } } @@ -64,7 +63,7 @@ msg_error_t peer_wait_for_message(peer_t peer) if (idx != -1) { comm = xbt_dynar_get_as(peer->pending_recvs, idx, msg_comm_t); status = MSG_comm_get_status(comm); - XBT_DEBUG("peer_wait_for_message: error code = %d", status); + XBT_DEBUG("peer_wait_for_message: error code = %u", status); xbt_assert(status == MSG_OK, "peer_wait_for_message() failed"); task = MSG_comm_get_task(comm); @@ -131,7 +130,7 @@ void peer_delete(peer_t p) void peer_print_stats(peer_t p, float elapsed_time) { - XBT_INFO("### %f %llu bytes (Avg %f MB/s); copy finished (simulated).", elapsed_time, p->bytes, p->bytes / 1024.0 / 1024.0 / elapsed_time); + XBT_INFO("### %f %llu bytes (Avg %f MB/s); copy finished (simulated).", elapsed_time, p->bytes, p->bytes / 1024.0 / 1024.0 / elapsed_time); } /** Peer function */