X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f24975b15b40cc3c4b7aa618aeee21cb3cc7e235..2eafbd98153afc6467f95dbb35f4bdabe909e934:/src/gras/Transport/transport_private.h

diff --git a/src/gras/Transport/transport_private.h b/src/gras/Transport/transport_private.h
index 9af4bed4cd..2588813a7e 100644
--- a/src/gras/Transport/transport_private.h
+++ b/src/gras/Transport/transport_private.h
@@ -17,15 +17,33 @@
 #include "xbt/dynar.h"
 #include "xbt/dict.h"
 
-#include "gras/emul.h"       /* gras_if_RL() */
+#include "gras/emul.h"          /* gras_if_RL() */
 
-#include "gras_modinter.h"   /* module init/exit */
-#include "gras/transport.h"  /* rest of module interface */
+#include "gras_modinter.h"      /* module init/exit */
+#include "gras/transport.h"     /* rest of module interface */
 
 #include "gras/Transport/transport_interface.h" /* semi-public API */
 #include "gras/Virtu/virtu_interface.h" /* libdata management */
 
 extern int gras_trp_libdata_id; /* our libdata identifier */
+
+/* The function that select returned the last time we asked. We need this
+   because the TCP read are greedy and try to get as much data in their 
+   buffer as possible (to avoid subsequent syscalls).
+   (measurement sockets are not buffered and thus not concerned).
+  
+   So, we can get more than one message in one shoot. And when this happens,
+   we have to handle the same socket again afterward without select()ing at
+   all. 
+ 
+   Then, this data is not a static of the TCP driver because we want to
+   zero it when it gets closed by the user. If not, we use an already freed 
+   pointer, which is bad.
+ 
+   It gets tricky since gras_socket_close is part of the common API, not 
+   only the RL one. */
+extern gras_socket_t _gras_lastly_selected_socket;
+
 /**
  * s_gras_socket:
  * 
@@ -33,40 +51,52 @@ extern int gras_trp_libdata_id; /* our libdata identifier */
  */
 typedef struct gras_trp_bufdata_ gras_trp_bufdata_t;
 
-typedef struct s_gras_socket  {
+typedef struct s_gras_socket {
   gras_trp_plugin_t plugin;
-    
-  int incoming :1; /* true if we can read from this sock */
-  int outgoing :1; /* true if we can write on this sock */
-  int accepting :1; /* true if master incoming sock in tcp */
-  int meas :1; /* true if this is an experiment socket instead of messaging */
 
-  unsigned long int bufSize; /* what to say to the OS. field here to remember it when accepting */
-   
-  int  sd; 
-  int  port; /* port on this side */
-  int  peer_port; /* port on the other side */
-  char *peer_name; /* hostname of the other side */
-
-  void *data;    /* plugin specific data */
+  int incoming:1;               /* true if we can read from this sock */
+  int outgoing:1;               /* true if we can write on this sock */
+  int accepting:1;              /* true if master incoming sock in tcp */
+  int meas:1;                   /* true if this is an experiment socket instead of messaging */
+  int valid:1;                  /* false if a select returned that the peer quitted, forcing us to "close" the socket */
+  int moredata:1;               /* TCP socket use a buffer and read operation get as much 
+                                   data as possible. It is possible that several messages
+                                   are received in one shoot, and select won't catch them 
+                                   afterward again. 
+                                   This boolean indicates that this is the case, so that we
+                                   don't call select in that case.  Note that measurement
+                                   sockets are not concerned since they use the TCP
+                                   interface directly, with no buffer. */
+
+  int recvd:1;                  /* true if the recvd_val field contains one byte of the stream (that we peek'ed to check the socket validity) */
+  char recvd_val;               /* what we peeked from the socket, if any */
+
+  unsigned long int buf_size;   /* what to say to the OS. 
+                                   Field here to remember it when accepting */
+
+  int sd;
+  int port;                     /* port on this side */
+  int peer_port;                /* port on the other side */
+  char *peer_name;              /* hostname of the other side */
+  char *peer_proc;              /* process on the other side */
+
+  void *data;                   /* plugin specific data */
 
   /* buffer plugin specific data. Yeah, C is not OO, so I got to trick */
-  gras_trp_bufdata_t *bufdata; 
-}s_gras_socket_t;
-	
-void gras_trp_socket_new(int incomming,
-			 gras_socket_t *dst);
+  gras_trp_bufdata_t *bufdata;
+} s_gras_socket_t;
+
+void gras_trp_socket_new(int incomming, gras_socket_t * dst);
 
 /* The drivers */
-typedef void (*gras_trp_setup_t)(gras_trp_plugin_t dst);
+typedef void (*gras_trp_setup_t) (gras_trp_plugin_t dst);
 
 void gras_trp_tcp_setup(gras_trp_plugin_t plug);
 void gras_trp_iov_setup(gras_trp_plugin_t plug);
 void gras_trp_file_setup(gras_trp_plugin_t plug);
 void gras_trp_sg_setup(gras_trp_plugin_t plug);
-void gras_trp_buf_setup(gras_trp_plugin_t plug);
 
-/*
+/* FIXME: this should be solved by SIMIX
 
   I'm tired of that shit. the select in SG has to create a socket to expeditor
   manually do deal with the weirdness of the hostdata, themselves here to deal