X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0e9c0448c6566825b170b98ecff716b098bda10e..04e829f2dc9c85be2ea9b594437a988557c94c00:/examples/msg/bittorrent/messages.c diff --git a/examples/msg/bittorrent/messages.c b/examples/msg/bittorrent/messages.c index cd7cd4c24c..a0cfe0782f 100644 --- a/examples/msg/bittorrent/messages.c +++ b/examples/msg/bittorrent/messages.c @@ -1,8 +1,9 @@ - /* Copyright (c) 2012-2013. The SimGrid Team. - * All rights reserved. */ +/* 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 "messages.h" #include "bittorrent.h" @@ -11,16 +12,15 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_messages, #define BITS_TO_BYTES(x) ((x / 8) + (x % 8) ? 1 : 0) -/** - * Build a new empty message +/** @brief Build a new empty message * @param type type of the message - * @param issuer_host_name hostname of the issuer, for debuging purposes + * @param issuer_host_name hostname of the issuer, for debugging purposes * @param mailbox mailbox where the peer should answer * @param peer_id id of the issuer * @param size message size in bytes */ -msg_task_t task_message_new(e_message_type type, const char *issuer_host_name, - const char *mailbox, int peer_id, int size) +msg_task_t task_message_new(e_message_type type, const char *issuer_host_name, const char *mailbox, int peer_id, + int size) { message_t message = xbt_new(s_message_t, 1); message->issuer_host_name = issuer_host_name; @@ -32,57 +32,41 @@ msg_task_t task_message_new(e_message_type type, const char *issuer_host_name, return task; } -/** - * Builds a message containing an index. - */ -msg_task_t task_message_index_new(e_message_type type, - const char *issuer_host_name, - const char *mailbox, int peer_id, +/** Builds a message containing an index. */ +msg_task_t task_message_index_new(e_message_type type, const char *issuer_host_name, const char *mailbox, int peer_id, int index, int varsize) { - msg_task_t task = task_message_new(type, issuer_host_name, mailbox, peer_id, - task_message_size(type) + varsize); + msg_task_t task = task_message_new(type, issuer_host_name, mailbox, peer_id, task_message_size(type) + varsize); message_t message = MSG_task_get_data(task); message->index = index; return task; } -msg_task_t task_message_bitfield_new(const char *issuer_host_name, - const char *mailbox, int peer_id, - char *bitfield, int bitfield_size) +msg_task_t task_message_bitfield_new(const char *issuer_host_name, const char *mailbox, int peer_id, char *bitfield, + int bitfield_size) { - msg_task_t task = - task_message_new(MESSAGE_BITFIELD, issuer_host_name, mailbox, peer_id, - task_message_size(MESSAGE_BITFIELD) + - /* Size of bitfield in bytes */ - BITS_TO_BYTES(bitfield_size)); + msg_task_t task = task_message_new(MESSAGE_BITFIELD, issuer_host_name, mailbox, peer_id, + task_message_size(MESSAGE_BITFIELD) + BITS_TO_BYTES(bitfield_size)); message_t message = MSG_task_get_data(task); message->bitfield = bitfield; return task; } -msg_task_t task_message_request_new(const char *issuer_host_name, - const char *mailbox, int peer_id, - int index, int block_index, - int block_length) +msg_task_t task_message_request_new(const char *issuer_host_name, const char *mailbox, int peer_id, int index, + int block_index, int block_length) { - msg_task_t task = - task_message_index_new(MESSAGE_REQUEST, issuer_host_name, mailbox, - peer_id, index, 0); + msg_task_t task = task_message_index_new(MESSAGE_REQUEST, issuer_host_name, mailbox, peer_id, index, 0); message_t message = MSG_task_get_data(task); message->block_index = block_index; message->block_length = block_length; return task; } -msg_task_t task_message_piece_new(const char *issuer_host_name, - const char *mailbox, int peer_id, int index, - int block_index, - int block_length, int block_size) +msg_task_t task_message_piece_new(const char *issuer_host_name, const char *mailbox, int peer_id, int index, + int block_index, int block_length, int block_size) { - msg_task_t task = - task_message_index_new(MESSAGE_PIECE, issuer_host_name, mailbox, peer_id, - index, block_length * block_size); + msg_task_t task = task_message_index_new(MESSAGE_PIECE, issuer_host_name, mailbox, peer_id, index, + block_length * block_size); message_t message = MSG_task_get_data(task); message->block_index = block_index; message->block_length = block_length;