X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2703e1ee2a79e9fc7c86ebb122caa515ecf24d14..bd08f5fb99eea01833b2b83730a0732443da8d38:/examples/msg/chainsend/peer.c diff --git a/examples/msg/chainsend/peer.c b/examples/msg/chainsend/peer.c index 927517565b..6be29c17b7 100644 --- a/examples/msg/chainsend/peer.c +++ b/examples/msg/chainsend/peer.c @@ -1,3 +1,9 @@ +/* Copyright (c) 2012-2014. 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 "peer.h" XBT_LOG_NEW_DEFAULT_CATEGORY(msg_peer, @@ -17,7 +23,7 @@ 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(peer->me, peer->next, NULL, msg->data_length); + 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); @@ -93,12 +99,11 @@ void peer_init(peer_t p, int argc, char *argv[]) p->bytes = 0; p->pending_recvs = xbt_dynar_new(sizeof(msg_comm_t), NULL); p->pending_sends = xbt_dynar_new(sizeof(msg_comm_t), NULL); - p->me = xbt_new(char, HOSTNAME_LENGTH); /* Set mailbox name: use host number from argv or hostname if no argument given */ if (argc > 1) { - snprintf(p->me, HOSTNAME_LENGTH, "host%s", argv[1]); + p->me = bprintf("host%s", argv[1]); } else { - strncpy(p->me, MSG_host_get_name(MSG_host_self()), HOSTNAME_LENGTH); + p->me = xbt_strdup(MSG_host_get_name(MSG_host_self())); } } @@ -127,6 +132,8 @@ void peer_delete(peer_t p) xbt_dynar_free(&p->pending_recvs); xbt_dynar_free(&p->pending_sends); xbt_free(p->me); + xbt_free(p->prev); + xbt_free(p->next); xbt_free(p); }