X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0868c23f9325ad81241a6e1df80e804d7f4067b7..5870aa69162283489736e640e3d36a3ef163e037:/examples/msg/bittorrent/messages.c

diff --git a/examples/msg/bittorrent/messages.c b/examples/msg/bittorrent/messages.c
index bebb90c8c2..b5ecc8887e 100644
--- a/examples/msg/bittorrent/messages.c
+++ b/examples/msg/bittorrent/messages.c
@@ -5,22 +5,29 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 #include "messages.h"
 #include "bittorrent.h"
+
+XBT_LOG_NEW_DEFAULT_CATEGORY(msg_messages, "Messages specific for the message factory");
+
+#define BITS_TO_BYTES(x) ((x / 8) + (x % 8) ? 1 : 0)
+
 /**
  * Build a new empty message
  * @param type type of the message
  * @param issuer_host_name hostname of the issuer, for debuging 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)
+                            const char *mailbox, int peer_id, int size)
 {
   message_t message = xbt_new(s_message_t, 1);
   message->issuer_host_name = issuer_host_name;
   message->peer_id = peer_id;
   message->mailbox = mailbox;
   message->type = type;
-  msg_task_t task = MSG_task_create(NULL, 0, MESSAGE_SIZE, message);
+  msg_task_t task = MSG_task_create(NULL, 0, size, message);
+  XBT_DEBUG("type: %d size: %d", (int)type, size);
   return task;
 }
 
@@ -29,9 +36,11 @@ msg_task_t task_message_new(e_message_type type, const char *issuer_host_name,
  */
 msg_task_t task_message_index_new(e_message_type type,
                                   const char *issuer_host_name,
-                                  const char *mailbox, int peer_id, int index)
+                                  const char *mailbox, int peer_id, 
+                                  int index, int varsize)
 {
-  msg_task_t task = task_message_new(type, issuer_host_name, mailbox, peer_id);
+  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;
@@ -39,10 +48,13 @@ msg_task_t task_message_index_new(e_message_type type,
 
 msg_task_t task_message_bitfield_new(const char *issuer_host_name,
                                      const char *mailbox, int peer_id,
-                                     char *bitfield)
+                                     char *bitfield, int bitfield_size)
 {
   msg_task_t task =
-      task_message_new(MESSAGE_BITFIELD, issuer_host_name, mailbox, peer_id);
+      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));
   message_t message = MSG_task_get_data(task);
   message->bitfield = bitfield;
   return task;
@@ -54,7 +66,7 @@ msg_task_t task_message_request_new(const char *issuer_host_name,
 {
   msg_task_t task =
       task_message_index_new(MESSAGE_REQUEST, issuer_host_name, mailbox,
-                             peer_id, index);
+                             peer_id, index, 0);
   message_t message = MSG_task_get_data(task);
   message->block_index = block_index;
   message->block_length = block_length;
@@ -64,11 +76,11 @@ msg_task_t task_message_request_new(const char *issuer_host_name,
 msg_task_t task_message_piece_new(const char *issuer_host_name,
                                   const char *mailbox, int peer_id, int index,
                                   int stalled, int block_index,
-                                  int block_length)
+                                  int block_length, int block_size)
 {
   msg_task_t task =
       task_message_index_new(MESSAGE_PIECE, issuer_host_name, mailbox, peer_id,
-                             index);
+                             index, block_length * block_size);
   message_t message = MSG_task_get_data(task);
   message->stalled = stalled;
   message->block_index = block_index;
@@ -82,3 +94,21 @@ void task_message_free(void *task)
   xbt_free(message);
   MSG_task_destroy(task);
 }
+
+int task_message_size(e_message_type type)
+{
+  int size = 0;
+  switch (type) {
+    case MESSAGE_HANDSHAKE: size = MESSAGE_HANDSHAKE_SIZE; break;
+    case MESSAGE_CHOKE: size = MESSAGE_CHOKE_SIZE; break;
+    case MESSAGE_UNCHOKE: size = MESSAGE_UNCHOKE_SIZE; break;
+    case MESSAGE_INTERESTED: size = MESSAGE_INTERESTED_SIZE; break;
+    case MESSAGE_NOTINTERESTED: size = MESSAGE_INTERESTED_SIZE; break;
+    case MESSAGE_HAVE: size = MESSAGE_HAVE_SIZE; break;
+    case MESSAGE_BITFIELD: size = MESSAGE_BITFIELD_SIZE; break;
+    case MESSAGE_REQUEST: size = MESSAGE_REQUEST_SIZE; break;
+    case MESSAGE_PIECE: size = MESSAGE_PIECE_SIZE; break;
+    case MESSAGE_CANCEL: size = MESSAGE_CANCEL_SIZE; break;
+  }
+  return size;
+}