X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4bb60fefa54ed1665d3452e2a748d26904b46f37..b3b356352e87ae00a20f737c48e19b0c8413455a:/examples/msg/bittorrent/peer.c diff --git a/examples/msg/bittorrent/peer.c b/examples/msg/bittorrent/peer.c index b0ddebc845..4382710951 100644 --- a/examples/msg/bittorrent/peer.c +++ b/examples/msg/bittorrent/peer.c @@ -1,13 +1,14 @@ -/* 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 +#include #include #include @@ -23,6 +24,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_peers, "Messages specific for the peers"); #define FILE_PIECES 10 #define PIECES_BLOCKS 5 #define BLOCK_SIZE 16384 +#define ENABLE_END_GAME_MODE 1 /** * Number of blocks asked by each request @@ -30,13 +32,10 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_peers, "Messages specific for the peers"); #define BLOCKS_REQUESTED 2 -static const int FILE_SIZE = FILE_PIECES * PIECES_BLOCKS * BLOCK_SIZE; +static const unsigned long int FILE_SIZE = FILE_PIECES * PIECES_BLOCKS * BLOCK_SIZE; -void request_new_piece_to_peer(peer_t peer, connection_t remote_peer); -void send_request_to_peer(peer_t peer, connection_t remote_peer, int piece); -void remove_current_piece(peer_t peer, connection_t remote_peer, - int current_piece); +#define SLEEP_DURATION 1 /** * Peer main function @@ -68,7 +67,6 @@ int peer(int argc, char *argv[]) seed_loop(&peer, deadline); } else { leech_loop(&peer, deadline); -// XBT_INFO("%d becomes a seeder", peer.id); seed_loop(&peer, deadline); } } else { @@ -98,36 +96,33 @@ void leech_loop(peer_t peer, double deadline) * (since it couldn't have gotten more than 50 peers) */ send_handshake_all(peer); - //Wait for at least one "bitfield" message. -// wait_for_pieces(peer, deadline); XBT_DEBUG("Starting main leech loop"); while (MSG_get_clock() < deadline && peer->pieces < FILE_PIECES) { if (peer->comm_received == NULL) { -// XBT_INFO("irecv"); peer->task_received = NULL; - peer->comm_received = - MSG_task_irecv(&peer->task_received, peer->mailbox); + peer->comm_received = MSG_task_irecv(&peer->task_received, peer->mailbox); } if (MSG_comm_test(peer->comm_received)) { -// XBT_INFO("comm_test OK"); msg_error_t status = MSG_comm_get_status(peer->comm_received); MSG_comm_destroy(peer->comm_received); peer->comm_received = NULL; if (status == MSG_OK) { - handle_message(peer, peer->task_received); + handle_message(peer, peer->task_received); } } else { - handle_pending_sends(peer); //We don't execute the choke algorithm if we don't already have a piece if (MSG_get_clock() >= next_choked_update && peer->pieces > 0) { - update_choked_peers(peer); - next_choked_update += UPDATE_CHOKED_INTERVAL; + update_choked_peers(peer); + next_choked_update += UPDATE_CHOKED_INTERVAL; } else { - MSG_process_sleep(1); + MSG_process_sleep(SLEEP_DURATION); } } } + if (peer->pieces == FILE_PIECES) + XBT_DEBUG("%d becomes a seeder", peer->id); + } /** @@ -143,23 +138,22 @@ void seed_loop(peer_t peer, double deadline) while (MSG_get_clock() < deadline) { if (peer->comm_received == NULL) { peer->task_received = NULL; - peer->comm_received = - MSG_task_irecv(&peer->task_received, peer->mailbox); + peer->comm_received = MSG_task_irecv(&peer->task_received, peer->mailbox); } if (MSG_comm_test(peer->comm_received)) { msg_error_t status = MSG_comm_get_status(peer->comm_received); MSG_comm_destroy(peer->comm_received); peer->comm_received = NULL; if (status == MSG_OK) { - handle_message(peer, peer->task_received); + handle_message(peer, peer->task_received); } } else { if (MSG_get_clock() >= next_choked_update) { - update_choked_peers(peer); - //TODO: Change the choked peer algorithm when seeding. - next_choked_update += UPDATE_CHOKED_INTERVAL; + update_choked_peers(peer); + //TODO: Change the choked peer algorithm when seeding. + next_choked_update += UPDATE_CHOKED_INTERVAL; } else { - MSG_process_sleep(1); + MSG_process_sleep(SLEEP_DURATION); } } } @@ -175,17 +169,16 @@ int get_peers_data(peer_t peer) double timeout = MSG_get_clock() + GET_PEERS_TIMEOUT; //Build the task to send to the tracker tracker_task_data_t data = - tracker_task_data_new(MSG_host_get_name(MSG_host_self()), - peer->mailbox_tracker, peer->id, 0, 0, FILE_SIZE); + tracker_task_data_new(MSG_host_get_name(MSG_host_self()), + peer->mailbox_tracker, peer->id, 0, 0, FILE_SIZE); //Build the task to send. msg_task_t task_send = MSG_task_create(NULL, 0, TRACKER_COMM_SIZE, data); msg_task_t task_received = NULL; msg_comm_t comm_received; while (!send_success && MSG_get_clock() < timeout) { XBT_DEBUG("Sending a peer request to the tracker."); - msg_error_t status = - MSG_task_send_with_timeout(task_send, TRACKER_MAILBOX, - GET_PEERS_TIMEOUT); + msg_error_t status = MSG_task_send_with_timeout(task_send, TRACKER_MAILBOX, + GET_PEERS_TIMEOUT); if (status == MSG_OK) { send_success = 1; } @@ -199,9 +192,9 @@ int get_peers_data(peer_t peer) int peer_id; //Add the peers the tracker gave us to our peer list. xbt_dynar_foreach(data->peers, i, peer_id) { - if (peer_id != peer->id) - xbt_dict_set_ext(peer->peers, (char *) &peer_id, sizeof(int), - connection_new(peer_id), NULL); + if (peer_id != peer->id) + xbt_dict_set_ext(peer->peers, (char *) &peer_id, sizeof(int), + connection_new(peer_id), NULL); } success = 1; //free the communication and the task @@ -235,11 +228,11 @@ void peer_init(peer_t peer, int id, int seed) if (seed) { memset(peer->bitfield, '1', sizeof(char) * (FILE_PIECES + 1)); memset(peer->bitfield_blocks, '1', - sizeof(char) * FILE_PIECES * (PIECES_BLOCKS)); + sizeof(char) * FILE_PIECES * (PIECES_BLOCKS)); } else { memset(peer->bitfield, '0', sizeof(char) * (FILE_PIECES + 1)); memset(peer->bitfield_blocks, '0', - sizeof(char) * FILE_PIECES * (PIECES_BLOCKS)); + sizeof(char) * FILE_PIECES * (PIECES_BLOCKS)); } peer->bitfield[FILE_PIECES] = '\0'; @@ -249,12 +242,12 @@ void peer_init(peer_t peer, int id, int seed) 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; - peer->pending_sends = xbt_dynar_new(sizeof(msg_comm_t), NULL); } /** @@ -271,12 +264,9 @@ void peer_free(peer_t peer) xbt_dict_free(&peer->peers); xbt_dict_free(&peer->active_peers); xbt_dynar_free(&peer->current_pieces); - xbt_dynar_free(&peer->pending_sends); xbt_free(peer->pieces_count); xbt_free(peer->bitfield); xbt_free(peer->bitfield_blocks); - - RngStream_DeleteStream(&peer->stream); } /** @@ -285,8 +275,7 @@ void peer_free(peer_t peer) */ int has_finished(char *bitfield) { - return ((memchr(bitfield, '0', sizeof(char) * FILE_PIECES) == - NULL) ? 1 : 0); + return ((memchr(bitfield, '0', sizeof(char) * FILE_PIECES) == NULL) ? 1 : 0); } int nb_interested_peers(peer_t peer) @@ -302,31 +291,6 @@ int nb_interested_peers(peer_t peer) return nb; } -/** - * Handle pending sends and remove those which are done - * @param peer Peer data - */ -void handle_pending_sends(peer_t peer) -{ - int index; - - while ((index = MSG_comm_testany(peer->pending_sends)) != -1) { - msg_comm_t comm_send = - xbt_dynar_get_as(peer->pending_sends, index, msg_comm_t); - int status = MSG_comm_get_status(comm_send); - xbt_dynar_remove_at(peer->pending_sends, index, &comm_send); - XBT_DEBUG - ("Communication %p is finished with status %d, dynar size is now %lu", - comm_send, status, xbt_dynar_length(peer->pending_sends)); - - msg_task_t task = MSG_comm_get_task(comm_send); - MSG_comm_destroy(comm_send); - - if (status != MSG_OK) { - task_message_free(task); - } - } -} void update_active_peers_set(peer_t peer, connection_t remote_peer) { @@ -334,13 +298,13 @@ void update_active_peers_set(peer_t peer, connection_t remote_peer) if (remote_peer->interested && !remote_peer->choked_upload) { //add in the active peers set xbt_dict_set_ext(peer->active_peers, (char *) &remote_peer->id, - sizeof(int), remote_peer, NULL); + sizeof(int), remote_peer, NULL); } else { //remove xbt_ex_t e; TRY { xbt_dict_remove_ext(peer->active_peers, (char *) &remote_peer->id, - sizeof(int)); + sizeof(int)); } CATCH(e) { xbt_ex_free(e); @@ -359,17 +323,17 @@ void handle_message(peer_t peer, msg_task_t task) message_t message = MSG_task_get_data(task); connection_t remote_peer; remote_peer = - xbt_dict_get_or_null_ext(peer->peers, (char *) &message->peer_id, - sizeof(int)); + xbt_dict_get_or_null_ext(peer->peers, (char *) &message->peer_id, + sizeof(int)); switch (message->type) { case MESSAGE_HANDSHAKE: XBT_DEBUG("Received a HANDSHAKE from %s (%s)", message->mailbox, - message->issuer_host_name); + message->issuer_host_name); //Check if the peer is in our connection list. if (!remote_peer) { xbt_dict_set_ext(peer->peers, (char *) &message->peer_id, sizeof(int), - connection_new(message->peer_id), NULL); + connection_new(message->peer_id), NULL); send_handshake(peer, message->mailbox); } //Send our bitfield to the peer @@ -377,13 +341,13 @@ void handle_message(peer_t peer, msg_task_t task) break; case MESSAGE_BITFIELD: XBT_DEBUG("Recieved a BITFIELD message from %s (%s)", message->mailbox, - message->issuer_host_name); + message->issuer_host_name); //Update the pieces list update_pieces_count_from_bitfield(peer, message->bitfield); //Store the bitfield remote_peer->bitfield = xbt_strdup(message->bitfield); xbt_assert(!remote_peer->am_interested, - "Should not be interested at first"); + "Should not be interested at first"); if (is_interested(peer, remote_peer)) { remote_peer->am_interested = 1; send_interested(peer, message->mailbox); @@ -391,26 +355,27 @@ void handle_message(peer_t peer, msg_task_t task) break; case MESSAGE_INTERESTED: XBT_DEBUG("Recieved an INTERESTED message from %s (%s)", message->mailbox, - message->issuer_host_name); + message->issuer_host_name); xbt_assert((remote_peer != NULL), - "A non-in-our-list peer has sent us a message. WTH ?"); + "A non-in-our-list peer has sent us a message. WTH ?"); //Update the interested state of the peer. remote_peer->interested = 1; update_active_peers_set(peer, remote_peer); break; case MESSAGE_NOTINTERESTED: XBT_DEBUG("Received a NOTINTERESTED message from %s (%s)", - message->mailbox, message->issuer_host_name); + message->mailbox, message->issuer_host_name); xbt_assert((remote_peer != NULL), - "A non-in-our-list peer has sent us a message. WTH ?"); + "A non-in-our-list peer has sent us a message. WTH ?"); remote_peer->interested = 0; update_active_peers_set(peer, remote_peer); break; case MESSAGE_UNCHOKE: xbt_assert((remote_peer != NULL), - "A non-in-our-list peer has sent us a message. WTH ?"); + "A non-in-our-list peer has sent us a message. WTH ?"); XBT_DEBUG("Received a UNCHOKE message from %s (%s)", message->mailbox, - message->issuer_host_name); + message->issuer_host_name); + xbt_assert(remote_peer->choked_download, "WTF !!!"); remote_peer->choked_download = 0; //Send requests to the peer, since it has unchoked us if (remote_peer->am_interested) @@ -418,19 +383,20 @@ void handle_message(peer_t peer, msg_task_t task) break; case MESSAGE_CHOKE: xbt_assert((remote_peer != NULL), - "A non-in-our-list peer has sent us a message. WTH ?"); + "A non-in-our-list peer has sent us a message. WTH ?"); XBT_DEBUG("Received a CHOKE message from %s (%s)", message->mailbox, - message->issuer_host_name); + message->issuer_host_name); + xbt_assert(!remote_peer->choked_download, "WTF !!!"); remote_peer->choked_download = 1; remove_current_piece(peer, remote_peer, remote_peer->current_piece); break; case MESSAGE_HAVE: XBT_DEBUG("Received a HAVE message from %s (%s) of piece %d", - message->mailbox, message->issuer_host_name, message->index); + message->mailbox, message->issuer_host_name, message->index); xbt_assert(remote_peer->bitfield, "bitfield not received"); xbt_assert((message->index >= 0 - && message->index < FILE_PIECES), - "Wrong HAVE message received"); + && message->index < FILE_PIECES), + "Wrong HAVE message received"); remote_peer->bitfield[message->index] = '1'; peer->pieces_count[message->index]++; //If the piece is in our pieces, we tell the peer that we are interested. @@ -438,78 +404,81 @@ void handle_message(peer_t peer, msg_task_t task) remote_peer->am_interested = 1; send_interested(peer, message->mailbox); if (!remote_peer->choked_download) - request_new_piece_to_peer(peer, remote_peer); + request_new_piece_to_peer(peer, remote_peer); } break; case MESSAGE_REQUEST: + xbt_assert(remote_peer->interested, "WTF !!!"); + xbt_assert((message->index >= 0 - && message->index < FILE_PIECES), "Wrong request received"); + && message->index < FILE_PIECES), "Wrong request received"); if (!remote_peer->choked_upload) { XBT_DEBUG("Received a REQUEST from %s (%s) for %d (%d,%d)", - message->mailbox, message->issuer_host_name, message->peer_id, - message->block_index, - message->block_index + message->block_length); + message->mailbox, message->issuer_host_name, message->index, + message->block_index, + message->block_index + message->block_length); if (peer->bitfield[message->index] == '1') { - send_piece(peer, message->mailbox, message->index, 0, - message->block_index, message->block_length); + send_piece(peer, message->mailbox, message->index, + message->block_index, message->block_length); } } else { XBT_DEBUG("Received a REQUEST from %s (%s) for %d but he is choked.", - message->mailbox, message->issuer_host_name, - message->peer_id); + message->mailbox, message->issuer_host_name, message->peer_id); } break; case MESSAGE_PIECE: + XBT_DEBUG("Received piece %d (%d,%d) from %s (%s)", message->index, + message->block_index, + message->block_index + message->block_length, + message->mailbox, message->issuer_host_name); + xbt_assert(!remote_peer->choked_download, "WTF !!!"); + xbt_assert(remote_peer->am_interested || ENABLE_END_GAME_MODE, "Can't received a piece if I'm not interested wihtout end-game mode! piece (%d) bitfield(%s) remote bitfield(%s)", message->index, peer->bitfield, remote_peer->bitfield); + xbt_assert(remote_peer->choked_download != 1, "Can't received a piece if I'm choked !"); xbt_assert((message->index >= 0 - && message->index < FILE_PIECES), "Wrong piece received"); + && message->index < FILE_PIECES), "Wrong piece received"); //TODO: Execute à computation. - if (message->stalled) { - XBT_DEBUG("The received piece %d from %s (%s) is STALLED", - message->index, message->mailbox, message->issuer_host_name); - } else { - XBT_DEBUG("Received piece %d (%d,%d) from %s (%s)", message->index, - message->block_index, - message->block_index + message->block_length, - message->mailbox, message->issuer_host_name); if (peer->bitfield[message->index] == '0') { - update_bitfield_blocks(peer, message->index, message->block_index, - message->block_length); - if (piece_complete(peer, message->index)) { - //Removing the piece from our piece list - remove_current_piece(peer, remote_peer, message->index); - //Setting the fact that we have the piece - peer->bitfield[message->index] = '1'; - peer->pieces++; - XBT_DEBUG("My status is now %s", peer->bitfield); - //Sending the information to all the peers we are connected to - send_have(peer, message->index); - //sending UNINTERSTED to peers that doesn't have what we want. - update_interested_after_receive(peer); - } else { // piece not completed - send_request_to_peer(peer, remote_peer, message->index); // ask for the next block - } + update_bitfield_blocks(peer, message->index, message->block_index, + message->block_length); + if (piece_complete(peer, message->index)) { + //Removing the piece from our piece list + remove_current_piece(peer, remote_peer, message->index); + //Setting the fact that we have the piece + peer->bitfield[message->index] = '1'; + peer->pieces++; + XBT_DEBUG("My status is now %s", peer->bitfield); + //Sending the information to all the peers we are connected to + send_have(peer, message->index); + //sending UNINTERSTED to peers that doesn't have what we want. + update_interested_after_receive(peer); + } else { // piece not completed + send_request_to_peer(peer, remote_peer, message->index); // ask for the next block + } } else { - XBT_DEBUG("However, we already have it"); - request_new_piece_to_peer(peer, remote_peer); + XBT_DEBUG("However, we already have it"); + xbt_assert(ENABLE_END_GAME_MODE, "Should not happen because we don't use end game mode !"); + request_new_piece_to_peer(peer, remote_peer); } - } break; case MESSAGE_CANCEL: XBT_DEBUG("The received CANCEL from %s (%s)", - message->mailbox, message->issuer_host_name); + message->mailbox, message->issuer_host_name); break; } //Update the peer speed. if (remote_peer) { connection_add_speed_value(remote_peer, - 1.0 / (MSG_get_clock() - - peer->begin_receive_time)); + 1.0 / (MSG_get_clock() - + peer->begin_receive_time)); } peer->begin_receive_time = MSG_get_clock(); task_message_free(task); } +/** + * Selects the appropriate piece to download and requests it to the remote_peer + */ void request_new_piece_to_peer(peer_t peer, connection_t remote_peer) { int piece = select_piece_to_download(peer, remote_peer); @@ -519,10 +488,14 @@ void request_new_piece_to_peer(peer_t peer, connection_t remote_peer) } } +/** + * remove current_piece from the list of currently downloaded pieces. + */ void remove_current_piece(peer_t peer, connection_t remote_peer, - int current_piece) + int current_piece) { - int piece_index = -1, piece, i; + int piece_index = -1, piece; + unsigned int i; xbt_dynar_foreach(peer->current_pieces, i, piece) { if (piece == current_piece) { piece_index = i; @@ -554,42 +527,118 @@ void update_pieces_count_from_bitfield(peer_t peer, char *bitfield) /** * Return the piece to be downloaded * There are two cases (as described in "Bittorrent Architecture Protocol", Ryan Toole : + * If a piece is partially downloaded, this piece will be selected prioritarily * If the peer has strictly less than 4 pieces, he chooses a piece at random. * If the peer has more than pieces, he downloads the pieces that are the less - * replicated - * Note: "end game mode" policy is not implemented + * replicated (rarest policy). + * If all pieces have been downloaded or requested, we select a random requested piece (endgame mode). * @param peer: local peer * @param remote_peer: information about the connection * @return the piece to download if possible. -1 otherwise */ int select_piece_to_download(peer_t peer, connection_t remote_peer) { - // TODO : add strict priority policy + int piece = -1; - if (xbt_dynar_length(peer->current_pieces) >= (FILE_PIECES - peer->pieces)) { // end game mode - return -1; + piece = partially_downloaded_piece(peer, remote_peer); + // strict priority policy + if (piece != -1) + return piece; + + // end game mode + if (xbt_dynar_length(peer->current_pieces) >= (FILE_PIECES - peer->pieces) + && is_interested(peer, remote_peer)) { + if(!ENABLE_END_GAME_MODE) + return -1; + int i; + int nb_interesting_pieces = 0; + int random_piece_index, current_index = 0; + // compute the number of interesting pieces + for (i = 0; i < FILE_PIECES; i++) { + if (peer->bitfield[i] == '0' && remote_peer->bitfield[i] == '1') { + nb_interesting_pieces++; + } + } + xbt_assert(nb_interesting_pieces != 0, "WTF !!!"); + // get a random interesting piece + random_piece_index = + RngStream_RandInt(peer->stream, 0, nb_interesting_pieces - 1); + for (i = 0; i < FILE_PIECES; i++) { + if (peer->bitfield[i] == '0' && remote_peer->bitfield[i] == '1') { + if (random_piece_index == current_index) { + piece = i; + break; + } + current_index++; + } + } + xbt_assert(piece != -1, "WTF !!!"); + return piece; } - if (peer->pieces < 4 && is_interested_and_free(peer, remote_peer)) { // Random first policy - int piece = 0; - do { - piece = RngStream_RandInt(peer->stream, 0, FILE_PIECES - 1);; - } while (! - (peer->bitfield[piece] == '0' - && remote_peer->bitfield[piece] == '1' - && !in_current_pieces(peer, piece))); + // Random first policy + if (peer->pieces < 4 && is_interested_and_free(peer, remote_peer)) { + int i; + int nb_interesting_pieces = 0; + int random_piece_index, current_index = 0; + // compute the number of interesting pieces + for (i = 0; i < FILE_PIECES; i++) { + if (peer->bitfield[i] == '0' && remote_peer->bitfield[i] == '1' + && !in_current_pieces(peer, i)) { + nb_interesting_pieces++; + } + } + xbt_assert(nb_interesting_pieces != 0, "WTF !!!"); + // get a random interesting piece + random_piece_index = + RngStream_RandInt(peer->stream, 0, nb_interesting_pieces - 1); + for (i = 0; i < FILE_PIECES; i++) { + if (peer->bitfield[i] == '0' && remote_peer->bitfield[i] == '1' + && !in_current_pieces(peer, i)) { + if (random_piece_index == current_index) { + piece = i; + break; + } + current_index++; + } + } + xbt_assert(piece != -1, "WTF !!!"); return piece; - } else { // Rarest first policy - int i, min_piece = -1; + } else { // Rarest first policy + int i; short min = SHRT_MAX; + int nb_min_pieces = 0; + int random_rarest_index, current_index = 0; + // compute the smallest number of copies of available pieces for (i = 0; i < FILE_PIECES; i++) { if (peer->pieces_count[i] < min && peer->bitfield[i] == '0' - && remote_peer->bitfield[i] == '1' && !in_current_pieces(peer, i)) { - min = peer->pieces_count[i]; - min_piece = i; + && remote_peer->bitfield[i] == '1' && !in_current_pieces(peer, i)) + min = peer->pieces_count[i]; + } + xbt_assert(min != SHRT_MAX + || !is_interested_and_free(peer, remote_peer), "WTF !!!"); + // compute the number of rarest pieces + for (i = 0; i < FILE_PIECES; i++) { + if (peer->pieces_count[i] == min && peer->bitfield[i] == '0' + && remote_peer->bitfield[i] == '1' && !in_current_pieces(peer, i)) + nb_min_pieces++; + } + xbt_assert(nb_min_pieces != 0 + || !is_interested_and_free(peer, remote_peer), "WTF !!!"); + // get a random rarest piece + random_rarest_index = RngStream_RandInt(peer->stream, 0, nb_min_pieces - 1); + for (i = 0; i < FILE_PIECES; i++) { + if (peer->pieces_count[i] == min && peer->bitfield[i] == '0' + && remote_peer->bitfield[i] == '1' && !in_current_pieces(peer, i)) { + if (random_rarest_index == current_index) { + piece = i; + break; + } + current_index++; } } - // TODO: add randomness when selecting a rarest piece - return min_piece; + xbt_assert(piece != -1 + || !is_interested_and_free(peer, remote_peer), "WTF !!!"); + return piece; } } @@ -606,10 +655,10 @@ void update_choked_peers(peer_t peer) // if(xbt_dict_size(peer->active_peers) > 0) // return; XBT_DEBUG("(%d) update_choked peers %d active peers", peer->id, - xbt_dict_size(peer->active_peers)); + xbt_dict_size(peer->active_peers)); //update the current round peer->round = (peer->round + 1) % 3; - char *key, *key_choked; + char *key, *key_choked=NULL; connection_t peer_choosed = NULL; connection_t peer_choked = NULL; //remove a peer from the list @@ -631,9 +680,9 @@ void update_choked_peers(peer_t peer) xbt_dict_foreach(peer->peers, cursor, key, connection) { if (connection->last_unchoke < unchoke_time && connection->interested - && connection->choked_upload) { - unchoke_time = connection->last_unchoke; - peer_choosed = connection; + && connection->choked_upload) { + unchoke_time = connection->last_unchoke; + peer_choosed = connection; } } } else { @@ -641,43 +690,43 @@ void update_choked_peers(peer_t peer) if (peer->round == 0) { int j = 0; do { - //We choose a random peer to unchoke. - int id_chosen = RngStream_RandInt(peer->stream, 0, - xbt_dict_length(peer->peers) - 1); - int i = 0; - connection_t connection; - xbt_dict_foreach(peer->peers, cursor, key, connection) { - if (i == id_chosen) { - peer_choosed = connection; - break; - } - i++; - } - xbt_dict_cursor_free(&cursor); - if (!peer_choosed->interested || !peer_choosed->choked_upload) { - peer_choosed = NULL; - } - j++; + //We choose a random peer to unchoke. + int id_chosen = RngStream_RandInt(peer->stream, 0, + xbt_dict_length(peer->peers) - 1); + int i = 0; + connection_t connection; + xbt_dict_foreach(peer->peers, cursor, key, connection) { + if (i == id_chosen) { + peer_choosed = connection; + break; + } + i++; + } + xbt_dict_cursor_free(&cursor); + if (!peer_choosed->interested || !peer_choosed->choked_upload) { + peer_choosed = NULL; + } + j++; } while (peer_choosed == NULL && j < MAXIMUM_PAIRS); } else { //Use the "fastest download" policy. connection_t connection; double fastest_speed = 0.0; xbt_dict_foreach(peer->peers, cursor, key, connection) { - if (connection->peer_speed > fastest_speed - && connection->choked_upload && connection->interested) { - peer_choosed = connection; - fastest_speed = connection->peer_speed; - } + if (connection->peer_speed > fastest_speed + && connection->choked_upload && connection->interested) { + peer_choosed = connection; + fastest_speed = connection->peer_speed; + } } } } if (peer_choosed != NULL) XBT_DEBUG - ("(%d) update_choked peers unchoked (%d) ; int (%d) ; choked (%d) ", - peer->id, peer_choosed->id, peer_choosed->interested, - peer_choosed->choked_upload); + ("(%d) update_choked peers unchoked (%d) ; int (%d) ; choked (%d) ", + peer->id, peer_choosed->id, peer_choosed->interested, + peer_choosed->choked_upload); // if (xbt_dict_size(peer->peers) > 0) // xbt_assert((xbt_dict_size(peer->active_peers) != 0), @@ -692,7 +741,7 @@ void update_choked_peers(peer_t peer) if (peer_choked != peer_choosed) { if (peer_choked != NULL) { xbt_assert((!peer_choked->choked_upload), - "Tries to choked a choked peer"); + "Tries to choked a choked peer"); peer_choked->choked_upload = 1; xbt_assert((*((int *) key_choked) == peer_choked->id), "WTF !!!"); update_active_peers_set(peer, peer_choked); @@ -702,10 +751,10 @@ void update_choked_peers(peer_t peer) } if (peer_choosed != NULL) { xbt_assert((peer_choosed->choked_upload), - "Tries to unchoked an unchoked peer"); + "Tries to unchoked an unchoked peer"); peer_choosed->choked_upload = 0; xbt_dict_set_ext(peer->active_peers, (char *) &peer_choosed->id, - sizeof(int), peer_choosed, NULL); + sizeof(int), peer_choosed, NULL); peer_choosed->last_unchoke = MSG_get_clock(); XBT_DEBUG("(%d) Sending a UNCHOKE to %d", peer->id, peer_choosed->id); update_active_peers_set(peer, peer_choosed); @@ -724,8 +773,7 @@ void update_interested_after_receive(peer_t peer) char *key; xbt_dict_cursor_t cursor; connection_t connection; - unsigned cpt; - int interested, piece; + int interested; xbt_dict_foreach(peer->peers, cursor, key, connection) { interested = 0; if (connection->am_interested) { @@ -733,27 +781,27 @@ void update_interested_after_receive(peer_t peer) //Check if the peer still has a piece we want. int i; for (i = 0; i < FILE_PIECES; i++) { - if (connection->bitfield[i] == '1' && peer->bitfield[i] == '0') { - interested = 1; - break; - } + if (connection->bitfield[i] == '1' && peer->bitfield[i] == '0') { + interested = 1; + break; + } } - if (!interested) { //no more piece to download from connection - connection->am_interested = 0; - send_notinterested(peer, connection->mailbox); + if (!interested) { //no more piece to download from connection + connection->am_interested = 0; + send_notinterested(peer, connection->mailbox); } } } } void update_bitfield_blocks(peer_t peer, int index, int block_index, - int block_length) + int block_length) { int i; xbt_assert((index >= 0 && index <= FILE_PIECES), "Wrong piece."); xbt_assert((block_index >= 0 - && block_index <= PIECES_BLOCKS), "Wrong block : %d.", - block_index); + && block_index <= PIECES_BLOCKS), "Wrong block : %d.", + block_index); for (i = block_index; i < (block_index + block_length); i++) { peer->bitfield_blocks[index * PIECES_BLOCKS + i] = '1'; } @@ -789,8 +837,7 @@ int get_first_block(peer_t peer, int piece) } /** - * Returns a piece that is stored by the remote peer but not by the local peer. - * -1 otherwise. + * Indicates if the remote peer has a piece not stored by the local peer */ int is_interested(peer_t peer, connection_t remote_peer) { @@ -804,13 +851,16 @@ int is_interested(peer_t peer, connection_t remote_peer) return 0; } +/** + * Indicates if the remote peer has a piece not stored by the local peer nor requested by the local peer + */ int is_interested_and_free(peer_t peer, connection_t remote_peer) { xbt_assert(remote_peer->bitfield, "Bitfield not received"); int i; for (i = 0; i < FILE_PIECES; i++) { if (remote_peer->bitfield[i] == '1' && peer->bitfield[i] == '0' - && !in_current_pieces(peer, i)) { + && !in_current_pieces(peer, i)) { return 1; } } @@ -828,9 +878,9 @@ int partially_downloaded_piece(peer_t peer, connection_t remote_peer) int i; for (i = 0; i < FILE_PIECES; i++) { if (remote_peer->bitfield[i] == '1' && peer->bitfield[i] == '0' - && !in_current_pieces(peer, i)) { + && !in_current_pieces(peer, i)) { if (get_first_block(peer, i) > 0) - return i; + return i; } } return -1; @@ -845,7 +895,6 @@ int partially_downloaded_piece(peer_t peer, connection_t remote_peer) void send_request_to_peer(peer_t peer, connection_t remote_peer, int piece) { remote_peer->current_piece = piece; - unsigned i; int block_index, block_length; xbt_assert(remote_peer->bitfield, "bitfield not received"); xbt_assert(remote_peer->bitfield[piece] == '1', "WTF !!!"); @@ -853,8 +902,7 @@ void send_request_to_peer(peer_t peer, connection_t remote_peer, int piece) if (block_index != -1) { block_length = PIECES_BLOCKS - block_index; block_length = min(BLOCKS_REQUESTED, block_length); - send_request(peer, remote_peer->mailbox, piece, block_index, - block_length); + send_request(peer, remote_peer->mailbox, piece, block_index, block_length); } } @@ -893,8 +941,8 @@ int in_current_pieces(peer_t peer, int piece) void send_interested(peer_t peer, const char *mailbox) { msg_task_t task = - task_message_new(MESSAGE_INTERESTED, peer->hostname, peer->mailbox, - peer->id, task_message_size(MESSAGE_INTERESTED)); + task_message_new(MESSAGE_INTERESTED, peer->hostname, peer->mailbox, + peer->id, task_message_size(MESSAGE_INTERESTED)); MSG_task_dsend(task, mailbox, task_message_free); XBT_DEBUG("Sending INTERESTED to %s", mailbox); @@ -908,8 +956,8 @@ void send_interested(peer_t peer, const char *mailbox) void send_notinterested(peer_t peer, const char *mailbox) { msg_task_t task = - task_message_new(MESSAGE_NOTINTERESTED, peer->hostname, peer->mailbox, - peer->id, task_message_size(MESSAGE_NOTINTERESTED)); + task_message_new(MESSAGE_NOTINTERESTED, peer->hostname, peer->mailbox, + peer->id, task_message_size(MESSAGE_NOTINTERESTED)); MSG_task_dsend(task, mailbox, task_message_free); XBT_DEBUG("Sending NOTINTERESTED to %s", mailbox); @@ -926,8 +974,8 @@ void send_handshake_all(peer_t peer) char *key; xbt_dict_foreach(peer->peers, cursor, key, remote_peer) { msg_task_t task = - task_message_new(MESSAGE_HANDSHAKE, peer->hostname, peer->mailbox, - peer->id, task_message_size(MESSAGE_HANDSHAKE)); + task_message_new(MESSAGE_HANDSHAKE, peer->hostname, peer->mailbox, + peer->id, task_message_size(MESSAGE_HANDSHAKE)); MSG_task_dsend(task, remote_peer->mailbox, task_message_free); XBT_DEBUG("Sending a HANDSHAKE to %s", remote_peer->mailbox); } @@ -941,8 +989,8 @@ void send_handshake_all(peer_t peer) void send_handshake(peer_t peer, const char *mailbox) { msg_task_t task = - task_message_new(MESSAGE_HANDSHAKE, peer->hostname, peer->mailbox, - peer->id, task_message_size(MESSAGE_HANDSHAKE)); + task_message_new(MESSAGE_HANDSHAKE, peer->hostname, peer->mailbox, + peer->id, task_message_size(MESSAGE_HANDSHAKE)); MSG_task_dsend(task, mailbox, task_message_free); XBT_DEBUG("Sending a HANDSHAKE to %s", mailbox); } @@ -954,8 +1002,8 @@ void send_choked(peer_t peer, const char *mailbox) { XBT_DEBUG("Sending a CHOKE to %s", mailbox); msg_task_t task = - task_message_new(MESSAGE_CHOKE, peer->hostname, peer->mailbox, - peer->id, task_message_size(MESSAGE_CHOKE)); + task_message_new(MESSAGE_CHOKE, peer->hostname, peer->mailbox, + peer->id, task_message_size(MESSAGE_CHOKE)); MSG_task_dsend(task, mailbox, task_message_free); } @@ -966,8 +1014,8 @@ void send_unchoked(peer_t peer, const char *mailbox) { XBT_DEBUG("Sending a UNCHOKE to %s", mailbox); msg_task_t task = - task_message_new(MESSAGE_UNCHOKE, peer->hostname, peer->mailbox, - peer->id, task_message_size(MESSAGE_UNCHOKE)); + task_message_new(MESSAGE_UNCHOKE, peer->hostname, peer->mailbox, + peer->id, task_message_size(MESSAGE_UNCHOKE)); MSG_task_dsend(task, mailbox, task_message_free); } @@ -982,9 +1030,9 @@ void send_have(peer_t peer, int piece) char *key; xbt_dict_foreach(peer->peers, cursor, key, remote_peer) { msg_task_t task = - task_message_index_new(MESSAGE_HAVE, peer->hostname, peer->mailbox, - peer->id, piece, - task_message_size(MESSAGE_HAVE)); + task_message_index_new(MESSAGE_HAVE, peer->hostname, peer->mailbox, + peer->id, piece, + task_message_size(MESSAGE_HAVE)); MSG_task_dsend(task, remote_peer->mailbox, task_message_free); } } @@ -997,40 +1045,38 @@ void send_bitfield(peer_t peer, const char *mailbox) { XBT_DEBUG("Sending a BITFIELD to %s", mailbox); msg_task_t task = - task_message_bitfield_new(peer->hostname, peer->mailbox, peer->id, - peer->bitfield, FILE_PIECES); - //Async send and append to pending sends - msg_comm_t comm = MSG_task_isend(task, mailbox); - xbt_dynar_push(peer->pending_sends, &comm); + task_message_bitfield_new(peer->hostname, peer->mailbox, peer->id, + peer->bitfield, FILE_PIECES); + MSG_task_dsend(task, mailbox, task_message_free); } /** * Send a "request" message to a pair, containing a request for a piece */ void send_request(peer_t peer, const char *mailbox, int piece, - int block_index, int block_length) + int block_index, int block_length) { XBT_DEBUG("Sending a REQUEST to %s for piece %d (%d,%d)", mailbox, piece, - block_index, block_length); + block_index, block_length); msg_task_t task = - task_message_request_new(peer->hostname, peer->mailbox, peer->id, piece, - block_index, block_length); + task_message_request_new(peer->hostname, peer->mailbox, peer->id, piece, + block_index, block_length); MSG_task_dsend(task, mailbox, task_message_free); } /** * Send a "piece" message to a pair, containing a piece of the file */ -void send_piece(peer_t peer, const char *mailbox, int piece, int stalled, - int block_index, int block_length) +void send_piece(peer_t peer, const char *mailbox, int piece, + int block_index, int block_length) { XBT_DEBUG("Sending the PIECE %d (%d,%d) to %s", piece, block_index, - block_length, mailbox); + block_length, mailbox); xbt_assert(piece >= 0, "Tried to send a piece that doesn't exist."); xbt_assert((peer->bitfield[piece] == '1'), - "Tried to send a piece that we doesn't have."); + "Tried to send a piece that we doesn't have."); msg_task_t task = - task_message_piece_new(peer->hostname, peer->mailbox, peer->id, piece, - stalled, block_index, block_length, BLOCK_SIZE); + task_message_piece_new(peer->hostname, peer->mailbox, peer->id, piece, + block_index, block_length, BLOCK_SIZE); MSG_task_dsend(task, mailbox, task_message_free); }