X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5c145db0b251fcbd6c859b25262651aaa5230fa9..778f65057da68465382593cd036b6ee59ada54e9:/src/gras/Transport/transport.c

diff --git a/src/gras/Transport/transport.c b/src/gras/Transport/transport.c
index 476780fefc..134b418420 100644
--- a/src/gras/Transport/transport.c
+++ b/src/gras/Transport/transport.c
@@ -7,6 +7,11 @@
 /* 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. */
 
+/***
+ *** Options
+ ***/
+int gras_opt_trp_nomoredata_on_close=0;
+
 #include "xbt/ex.h"
 #include "xbt/peer.h"
 #include "portable.h"
@@ -160,6 +165,7 @@ void gras_trp_socket_new(int incoming,
   sock->meas = 0;
   sock->recv_ok = 1;
   sock->valid = 1;
+  sock->moredata = 0;
 
   sock->sd     = -1;
   sock->port      = -1;
@@ -344,6 +350,15 @@ void gras_socket_close(gras_socket_t sock) {
 
   XBT_IN;
   VERB1("Close %p",sock);
+  if (sock == _gras_lastly_selected_socket) {
+     xbt_assert0(!gras_opt_trp_nomoredata_on_close || !sock->moredata,
+		 "Closing a socket having more data in buffer while the nomoredata_on_close option is activated");
+		 
+     if (sock->moredata) 
+       CRITICAL0("Closing a socket having more data in buffer. Option nomoredata_on_close disabled, so continuing.");
+     _gras_lastly_selected_socket=NULL;
+  }
+   
   /* FIXME: Issue an event when the socket is closed */
   if (sock) {
     xbt_dynar_foreach(sockets,cursor,sock_iter) {
@@ -430,8 +445,8 @@ int gras_socket_is_meas(gras_socket_t sock) {
  *
  * @param peer measurement socket to use for the experiment
  * @param timeout timeout (in seconds)
- * @param exp_size total amount of data to send (in bytes).
  * @param msg_size size of each chunk sent over the socket (in bytes).
+ * @param msg_amount how many of these packets you want to send. 
  *
  * Calls to gras_socket_meas_send() and gras_socket_meas_recv() on 
  * each side of the socket should be paired. 
@@ -439,14 +454,19 @@ int gras_socket_is_meas(gras_socket_t sock) {
  * The exchanged data is zeroed to make sure it's initialized, but
  * there is no way to control what is sent (ie, you cannot use these 
  * functions to exchange data out of band).
+ * 
+ * @warning: in SimGrid version 3.1 and previous, the numerical arguments 
+ *           were the total amount of data to send and the msg_size. This 
+ *           was changed for the fool wanting to send more than MAXINT 
+ *           bytes in a fat pipe. 
  */
 void gras_socket_meas_send(gras_socket_t peer, 
 			   unsigned int timeout,
-			   unsigned long int exp_size, 
-			   unsigned long int msg_size) {
+			   unsigned long int msg_size, 
+			   unsigned long int msg_amount) {
   char *chunk=NULL;
-  unsigned long int exp_sofar;
-   
+  unsigned long int sent_sofar;
+  
   XBT_IN;
 
   if (gras_if_RL()) 
@@ -455,14 +475,14 @@ void gras_socket_meas_send(gras_socket_t peer,
   xbt_assert0(peer->meas,"Asked to send measurement data on a regular socket");
   xbt_assert0(peer->outgoing,"Socket not suited for data send (was created with gras_socket_server(), not gras_socket_client())");
 
-  for (exp_sofar=0; exp_sofar < exp_size; exp_sofar += msg_size) {
-     CDEBUG5(gras_trp_meas,"Sent %lu of %lu (msg_size=%ld) to %s:%d",
-	     exp_sofar,exp_size,msg_size,
+  for (sent_sofar=0; sent_sofar < msg_amount; sent_sofar++) {
+     CDEBUG5(gras_trp_meas,"Sent %lu msgs of %lu (size of each: %ld) to %s:%d",
+	     sent_sofar,msg_amount,msg_size,
 	     gras_socket_peer_name(peer), gras_socket_peer_port(peer));
      (*peer->plugin->raw_send)(peer,chunk,msg_size);
   }
-  CDEBUG5(gras_trp_meas,"Sent %lu of %lu (msg_size=%ld) to %s:%d",
-	  exp_sofar,exp_size,msg_size,
+  CDEBUG5(gras_trp_meas,"Sent %lu msgs of %lu (size of each: %ld) to %s:%d",
+	  sent_sofar,msg_amount,msg_size,
 	  gras_socket_peer_name(peer), gras_socket_peer_port(peer));
 	     
   if (gras_if_RL()) 
@@ -475,14 +495,19 @@ void gras_socket_meas_send(gras_socket_t peer,
  *
  * Calls to gras_socket_meas_send() and gras_socket_meas_recv() on 
  * each side of the socket should be paired. 
+ *
+ * @warning: in SimGrid version 3.1 and previous, the numerical arguments 
+ *           were the total amount of data to send and the msg_size. This 
+ *           was changed for the fool wanting to send more than MAXINT 
+ *           bytes in a fat pipe. 
  */
 void gras_socket_meas_recv(gras_socket_t peer, 
 			   unsigned int timeout,
-			   unsigned long int exp_size, 
-			   unsigned long int msg_size){
+			   unsigned long int msg_size, 
+			   unsigned long int msg_amount){
   
   char *chunk=NULL;
-  unsigned long int exp_sofar;
+  unsigned long int got_sofar;
 
   XBT_IN;
 
@@ -493,14 +518,14 @@ void gras_socket_meas_recv(gras_socket_t peer,
 	      "Asked to receive measurement data on a regular socket");
   xbt_assert0(peer->incoming,"Socket not suited for data receive");
 
-  for (exp_sofar=0; exp_sofar < exp_size; exp_sofar += msg_size) {
-     CDEBUG5(gras_trp_meas,"Recvd %ld of %lu (msg_size=%ld) from %s:%d",
-	     exp_sofar,exp_size,msg_size,
+  for (got_sofar=0; got_sofar < msg_amount; got_sofar ++) {
+     CDEBUG5(gras_trp_meas,"Recvd %ld msgs of %lu (size of each: %ld) from %s:%d",
+	     got_sofar,msg_amount,msg_size,
 	     gras_socket_peer_name(peer), gras_socket_peer_port(peer));
      (peer->plugin->raw_recv)(peer,chunk,msg_size);
   }
-  CDEBUG5(gras_trp_meas,"Recvd %ld of %lu (msg_size=%ld) from %s:%d",
-	  exp_sofar,exp_size,msg_size,
+  CDEBUG5(gras_trp_meas,"Recvd %ld msgs of %lu (size of each: %ld) from %s:%d",
+	  got_sofar,msg_amount,msg_size,
 	  gras_socket_peer_name(peer), gras_socket_peer_port(peer));
 
   if (gras_if_RL())