A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yet another cleaning pass
[simgrid.git]
/
examples
/
msg
/
chainsend
/
peer.c
diff --git
a/examples/msg/chainsend/peer.c
b/examples/msg/chainsend/peer.c
index
9275175
..
433200e
100644
(file)
--- a/
examples/msg/chainsend/peer.c
+++ b/
examples/msg/chainsend/peer.c
@@
-1,11
+1,12
@@
-#include "peer.h"
+/* 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. */
-XBT_LOG_NEW_DEFAULT_CATEGORY(msg_peer,
- "Messages specific for the peer");
+#include "peer.h"
-/*******************************************************
- * Peer *
- *******************************************************/
+XBT_LOG_NEW_DEFAULT_CATEGORY(msg_peer, "Messages specific for the peer");
void peer_init_chain(peer_t peer, message_t msg)
{
void peer_init_chain(peer_t peer, message_t msg)
{
@@
-17,7
+18,7
@@
void peer_init_chain(peer_t peer, message_t msg)
static void peer_forward_msg(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);
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
+94,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->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) {
/* 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 {
} 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
+127,8
@@
void peer_delete(peer_t p)
xbt_dynar_free(&p->pending_recvs);
xbt_dynar_free(&p->pending_sends);
xbt_free(p->me);
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);
}
xbt_free(p);
}
@@
-154,4
+156,4
@@
int peer(int argc, char *argv[])
peer_delete(p);
return status;
peer_delete(p);
return status;
-}
/* end_of_receiver */
+}