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

diff --git a/examples/msg/bittorrent/messages.c b/examples/msg/bittorrent/messages.c
index 8eac54f451..d165051276 100644
--- a/examples/msg/bittorrent/messages.c
+++ b/examples/msg/bittorrent/messages.c
@@ -6,9 +6,9 @@
 #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)
 
 /**
@@ -20,16 +20,15 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_messages, "Messages specific for the message fa
  * @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)
+			    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;
 }
 
@@ -37,38 +36,39 @@ msg_task_t task_message_new(e_message_type type, const char *issuer_host_name,
  * 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)
+				  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);
+				     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)
+				     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));
+    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;
 }
 
 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,
-                             peer_id, index, 0);
+    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;
@@ -76,13 +76,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_length, int block_size)
+				  const char *mailbox, int peer_id, int index,
+				  int stalled, 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);
+    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;
@@ -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;
 }