Do not use recv() but read() to check whether a socket returned by select() is valid...

[simgrid.git] / src / gras / Transport / transport_private.h

diff --git a/src/gras/Transport/transport_private.h b/src/gras/Transport/transport_private.h
index 484cac4..1a04218 100644 (file)
--- a/src/gras/Transport/transport_private.h
+++ b/src/gras/Transport/transport_private.h
@@ -23,7 +23,26 @@
 #include "gras/transport.h"  /* rest of module interface */
 
 #include "gras/Transport/transport_interface.h" /* semi-public API */
-#include "gras/Virtu/virtu_interface.h" /* socketset_get() */
+#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:
@@ -39,13 +58,27 @@ typedef struct s_gras_socket  {
   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 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 */
 
@@ -63,9 +96,8 @@ 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
@@ -85,6 +117,4 @@ void gras_trp_buf_setup(gras_trp_plugin_t plug);
 
 gras_socket_t gras_trp_buf_init_sock(gras_socket_t sock);
 
-xbt_dynar_t gras_socketset_get(void); /* FIXME:KILLME */
-
 #endif /* GRAS_TRP_PRIVATE_H */