-/* Copyright (c) 2012. The SimGrid Team.
+/* Copyright (c) 2012-2015. 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"
#include "tracker.h"
#include "connection.h"
#include "messages.h"
-#include <msg/msg.h>
+#include <simgrid/msg.h>
#include <xbt/RngStream.h>
#include <limits.h>
xbt_assert(argc == 3 || argc == 4, "Wrong number of arguments");
//Build peer object
if (argc == 4) {
- peer_init(&peer, atoi(argv[1]), 1);
+ peer_init(&peer, xbt_str_parse_int(argv[1],"Invalid ID: %s"), 1);
} else {
- peer_init(&peer, atoi(argv[1]), 0);
+ peer_init(&peer, xbt_str_parse_int(argv[1],"Invalid ID: %s"), 0);
}
//Retrieve deadline
- double deadline = atof(argv[2]);
+ double deadline = xbt_str_parse_double(argv[2],"Invalid deadline: %s");
xbt_assert(deadline > 0, "Wrong deadline supplied");
XBT_INFO("Hi, I'm joining the network with id %d", peer.id);
//Getting peer data from the tracker.
peer->current_pieces = xbt_dynar_new(sizeof(int), NULL);
- peer->stream = RngStream_CreateStream("");
+ peer->stream =
+ (RngStream)MSG_host_get_property_value(MSG_host_self(), "stream");
peer->comm_received = NULL;
peer->round = 0;
xbt_free(peer->pieces_count);
xbt_free(peer->bitfield);
xbt_free(peer->bitfield_blocks);
-
- RngStream_DeleteStream(&peer->stream);
}
/**