X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0e0314deb67b21af9d4088bd5fe23300794de458..71b1bcf9d7039df9c5810da59f8adfe2adbd9dc8:/src/gras/Transport/transport_plugin_buf.c

diff --git a/src/gras/Transport/transport_plugin_buf.c b/src/gras/Transport/transport_plugin_buf.c
index b4f6bc7c17..d640ab7562 100644
--- a/src/gras/Transport/transport_plugin_buf.c
+++ b/src/gras/Transport/transport_plugin_buf.c
@@ -166,7 +166,8 @@ void gras_trp_buf_socket_close(gras_socket_t sock){
 
   XBT_IN;
   if (data->in.size!=data->in.pos) {
-     WARN1("Socket closed, but %d bytes were unread",data->in.size - data->in.pos);
+     WARN3("Socket closed, but %d bytes were unread (size=%d,pos=%d)",
+	   data->in.size - data->in.pos,data->in.size, data->in.pos);
   }
    
   if (data->out.size!=data->out.pos) {
@@ -266,10 +267,10 @@ gras_trp_buf_chunk_recv(gras_socket_t sock,
 	 data->in.pos=0;
       } else {
 	 memcpy((char*)&nextsize,data->in.data,4);
-	 data->in.size = (int)ntohl(nextsize)+4;
+	 data->in.size = nextsize+4;
 	 data->in.pos=4;
-	 VERB3("Got the chunk (size=%d+4 for the size ifself)='%.*s'",data->in.size-4,
-	       data->in.size,data->in.data);
+	 VERB3("Got the chunk (size=%d+4 for the size ifself)='%.*s'",
+	       data->in.size-4, data->in.size,data->in.data);
 	 if (XBT_LOG_ISENABLED(trp_buf,xbt_log_priority_debug))
 	   hexa_print("chunck received",data->in.data,data->in.size);
       }
@@ -307,16 +308,17 @@ gras_trp_buf_flush(gras_socket_t sock) {
   XBT_IN;
   DEBUG0("Flush");
   if (XBT_LOG_ISENABLED(trp_buf,xbt_log_priority_debug))
-     hexa_print("chunck to send",data->out.data,data->out.size);
+     hexa_print("chunck to send ",data->out.data,data->out.size);
   if ((data->out.size - data->out.pos) == (gras_if_RL()?0:4) ) { /* 4 first bytes=size in SG mode*/
      DEBUG2("Nothing to flush (size=%d; pos=%d)",data->out.size,data->out.pos);
      return no_error;
   }
    
-  size = (int)htonl(data->out.size - data->out.pos);
+  size = (int)data->out.size - data->out.pos;
   DEBUG4("%s the size (=%d) to %s:%d",(gras_if_RL()?"Send":"Embeed"),data->out.size-data->out.pos,
 	 gras_socket_peer_name(sock),gras_socket_peer_port(sock));
   if (gras_if_RL()) {
+     size = (int)htonl(size);
      TRY(super->chunk_send(sock,(char*) &size, 4));
   } else {
      memcpy(data->out.data, &size, 4);
@@ -328,7 +330,7 @@ gras_trp_buf_flush(gras_socket_t sock) {
   TRY(super->chunk_send(sock, data->out.data, data->out.size));
   VERB1("Chunk sent (size=%d)",data->out.size);
   if (XBT_LOG_ISENABLED(trp_buf,xbt_log_priority_debug))
-     hexa_print("chunck sent",data->out.data,data->out.size);
-  data->out.size = 0;
+     hexa_print("chunck sent    ",data->out.data,data->out.size);
+  data->out.size = gras_if_RL()?0:4;
   return no_error;
 }