-/* Copyright (c) 2006-2014, 2016. The SimGrid Team.
+/* Copyright (c) 2006-2014, 2016-2017. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
Msg.info("Wrong number of arguments");
}
if (args.length == 3) {
- init(Integer.valueOf(args[0]),true);
+ init(Integer.parseInt(args[0]),true);
} else {
- init(Integer.valueOf(args[0]),false);
+ init(Integer.parseInt(args[0]),false);
}
//Retrieve the deadline
- deadline = Double.valueOf(args[1]);
+ deadline = Double.parseDouble(args[1]);
if (deadline < 0) {
Msg.info("Wrong deadline supplied");
return;
return success;
}
- void handleMessage(Task task) {
+ private void handleMessage(Task task) {
MessageTask message = (MessageTask)task;
Connection remotePeer = peers.get(message.peerId);
switch (message.type) {
}
}
break;
+ default:
+ Msg.error("Unexpected message type: " + message.type);
+ break;
}
if (remotePeer != null) {
remotePeer.addSpeedValue(1 / (Msg.getClock() - beginReceiveTime));
beginReceiveTime = Msg.getClock();
}
- void waitForPieces() {
+ private void waitForPieces() {
boolean finished = false;
while (Msg.getClock() < deadline && !finished) {
if (commReceived == null) {
* @brief Updates the list of who has a piece from a bitfield
* @param bitfield bitfield
*/
- private void updatePiecesCountFromBitfield(char bitfield[]) {
+ private void updatePiecesCountFromBitfield(char[] bitfield) {
for (int i = 0; i < Common.FILE_PIECES; i++) {
if (bitfield[i] == '1') {
piecesCount[i]++;
* If the peer has more than pieces, he downloads the pieces that are the less
* replicated
*/
- void updateCurrentPiece() {
+ private void updateCurrentPiece() {
if (currentPieces.size() >= (Common.FILE_PIECES - pieces)) {
return;
}
-// if (pieces < 3) {
- do {
- currentPiece = stream.randInt(0,Common.FILE_PIECES - 1);
- } while (!(bitfield[currentPiece] == '0' && !currentPieces.contains(currentPiece)));
-// }
-// else {
- //TODO trivial min algorithm.
-// }
+
+ //TODO: trivial min algorithm when pieces >= 3
+ do {
+ currentPiece = stream.randInt(0,Common.FILE_PIECES - 1);
+ } while (!(bitfield[currentPiece] == '0' && !currentPieces.contains(currentPiece)));
+
currentPieces.add(currentPiece);
Msg.debug("New interested piece: " + currentPiece);
assert currentPiece >= 0 && currentPiece < Common.FILE_PIECES;
}
private String getStatus() {
- String s = "";
- for (int i = 0; i < Common.FILE_PIECES; i++) {
- s = s + bitfield[i];
- }
- return s;
+ StringBuilder s = new StringBuilder("");
+ for (int i = 0; i < Common.FILE_PIECES; i++)
+ s.append(bitfield[i]);
+ return s.toString();
}
}