X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ce8a9fdb7cad584a5e27d0d4af32b844d3e5420b..613cd4ffa7ffbfdd4f21bf7ecb6053daf666b95e:/examples/msg/bittorrent/messages.c

diff --git a/examples/msg/bittorrent/messages.c b/examples/msg/bittorrent/messages.c
index 8eac54f451..bfe1ea4a20 100644
--- a/examples/msg/bittorrent/messages.c
+++ b/examples/msg/bittorrent/messages.c
@@ -1,14 +1,15 @@
-  /* Copyright (c) 2012. 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"
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(msg_messages, "Messages specific for the message factory");
+XBT_LOG_NEW_DEFAULT_CATEGORY(msg_messages,
+                             "Messages specific for the message factory");
 
-#define BYTES_TO_MB(x) ((long double)x/1048576.0)
 #define BITS_TO_BYTES(x) ((x / 8) + (x % 8) ? 1 : 0)
 
 /**
@@ -22,14 +23,13 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_messages, "Messages specific for the message fa
 msg_task_t task_message_new(e_message_type type, const char *issuer_host_name,
                             const char *mailbox, int peer_id, int size)
 {
-  long double size_mb = BYTES_TO_MB(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, size_mb, message);
-  XBT_DEBUG("type: %d size: %.20Lg (%d)", type, size_mb, size);
+  msg_task_t task = MSG_task_create(NULL, 0, size, message);
+  XBT_DEBUG("type: %d size: %d", (int) type, size);
   return task;
 }
 
@@ -38,7 +38,7 @@ 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, 
+                                  const char *mailbox, int peer_id,
                                   int index, int varsize)
 {
   msg_task_t task = task_message_new(type, issuer_host_name, mailbox, peer_id,
@@ -54,8 +54,8 @@ msg_task_t task_message_bitfield_new(const char *issuer_host_name,
 {
   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 */ 
+                       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;
@@ -63,8 +63,9 @@ msg_task_t task_message_bitfield_new(const char *issuer_host_name,
 }
 
 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)
+                                    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,
@@ -77,14 +78,13 @@ 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_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);
   message_t message = MSG_task_get_data(task);
-  message->stalled = stalled;
   message->block_index = block_index;
   message->block_length = block_length;
   return task;
@@ -101,15 +101,36 @@ 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_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;
 }