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
kill useless code now that As::Seal() exists
[simgrid.git]
/
examples
/
msg
/
chainsend
/
broadcaster.c
diff --git
a/examples/msg/chainsend/broadcaster.c
b/examples/msg/chainsend/broadcaster.c
index 934e14a3d0be7327b2fd7a013095f60a46d9976a..112bb25db2645a89094fd5fbcc4879a1d33627a8 100644
(file)
--- a/
examples/msg/chainsend/broadcaster.c
+++ b/
examples/msg/chainsend/broadcaster.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 "broadcaster.h"
XBT_LOG_NEW_DEFAULT_CATEGORY(msg_broadcaster,
#include "broadcaster.h"
XBT_LOG_NEW_DEFAULT_CATEGORY(msg_broadcaster,
@@
-5,13
+11,11
@@
XBT_LOG_NEW_DEFAULT_CATEGORY(msg_broadcaster,
xbt_dynar_t build_hostlist_from_hostcount(int hostcount)
{
xbt_dynar_t build_hostlist_from_hostcount(int hostcount)
{
- xbt_dynar_t host_list = xbt_dynar_new(sizeof(char*), NULL);
- char *hostname = NULL;
- int i = 1;
+ xbt_dynar_t host_list = xbt_dynar_new(sizeof(char*), xbt_free_ref);
+ int i;
- for (; i < hostcount+1; i++) {
- hostname = xbt_new(char, HOSTNAME_LENGTH);
- snprintf(hostname, HOSTNAME_LENGTH, "host%d", i);
+ for (i = 1; i <= hostcount; i++) {
+ char *hostname = bprintf("host%d", i);
XBT_DEBUG("%s", hostname);
xbt_dynar_push(host_list, &hostname);
}
XBT_DEBUG("%s", hostname);
xbt_dynar_push(host_list, &hostname);
}
@@
-48,7
+52,7
@@
int broadcaster_build_chain(broadcaster_t bc)
XBT_DEBUG("Building chain -- broadcaster:\"%s\" dest:\"%s\" prev:\"%s\" next:\"%s\"", me, current_host, prev, next);
/* Send message to current peer */
XBT_DEBUG("Building chain -- broadcaster:\"%s\" dest:\"%s\" prev:\"%s\" next:\"%s\"", me, current_host, prev, next);
/* Send message to current peer */
- task = task_message_chain_new(
me, current_host,
prev, next, bc->piece_count);
+ task = task_message_chain_new(prev, next, bc->piece_count);
MSG_task_send(task, current_host);
last = current_host;
MSG_task_send(task, current_host);
last = current_host;
@@
-67,7
+71,7
@@
int broadcaster_send_file(broadcaster_t bc)
bc->current_piece = 0;
while (bc->current_piece < bc->piece_count) {
bc->current_piece = 0;
while (bc->current_piece < bc->piece_count) {
- task = task_message_data_new(
me, bc->first,
NULL, PIECE_SIZE);
+ task = task_message_data_new(NULL, PIECE_SIZE);
XBT_DEBUG("Sending (send) piece %d from %s into mailbox %s", bc->current_piece, me, bc->first);
MSG_task_send(task, bc->first);
bc->current_piece++;
XBT_DEBUG("Sending (send) piece %d from %s into mailbox %s", bc->current_piece, me, bc->first);
MSG_task_send(task, bc->first);
bc->current_piece++;
@@
-114,11
+118,11
@@
int broadcaster(int argc, char *argv[])
XBT_DEBUG("broadcaster");
/* Add every mailbox given by the hostcount in argv[1] to a dynamic array */
XBT_DEBUG("broadcaster");
/* Add every mailbox given by the hostcount in argv[1] to a dynamic array */
- host_list = build_hostlist_from_hostcount(
atoi(argv[1]
));
+ host_list = build_hostlist_from_hostcount(
xbt_str_parse_int(argv[1], "Invalid number of peers: %s"
));
/* argv[2] is the number of pieces */
if (argc > 2) {
/* argv[2] is the number of pieces */
if (argc > 2) {
- piece_count =
atoi(argv[2]
);
+ piece_count =
xbt_str_parse_int(argv[2], "Invalid number of pieces: %s"
);
XBT_DEBUG("piece_count set to %d", piece_count);
} else {
XBT_DEBUG("No piece_count specified, defaulting to %d", piece_count);
XBT_DEBUG("piece_count set to %d", piece_count);
} else {
XBT_DEBUG("No piece_count specified, defaulting to %d", piece_count);