Fix a vicious bug: TCP socket use a buffer and read operation get as much data as...

[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 ba53530..9b384ec 100644 (file)
--- a/src/gras/Transport/transport_private.h
+++ b/src/gras/Transport/transport_private.h
@@ -4,29 +4,28 @@
 
 /* module's private interface masked even to other parts of GRAS.           */
 
-/* Authors: Martin Quinson                                                  */
-/* Copyright (C) 2004 Martin Quinson.                                       */
+/* Copyright (c) 2004 Martin Quinson. All rights reserved.                  */
 
 /* 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. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #ifndef GRAS_TRP_PRIVATE_H
 #define GRAS_TRP_PRIVATE_H
 
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
-#include "xbt/error.h"
 #include "xbt/dynar.h"
 #include "xbt/dict.h"
 
-#include "gras/cond.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/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 */
 /**
  * s_gras_socket:
  * 
@@ -35,19 +34,25 @@
 typedef struct gras_trp_bufdata_ gras_trp_bufdata_t;
 
 typedef struct s_gras_socket  {
-  gras_trp_plugin_t *plugin;
+  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 raw :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 meas :1; /* true if this is an experiment socket instead of messaging */
+  int recv_ok :1; /* true if it is valid to recv() on the socket (false if it is a file) */
+  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. */
+
+  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 */
 
@@ -59,12 +64,12 @@ void gras_trp_socket_new(int incomming,
                         gras_socket_t *dst);
 
 /* The drivers */
-typedef xbt_error_t (*gras_trp_setup_t)(gras_trp_plugin_t *dst);
+typedef void (*gras_trp_setup_t)(gras_trp_plugin_t dst);
 
-xbt_error_t gras_trp_tcp_setup(gras_trp_plugin_t *plug);
-xbt_error_t gras_trp_file_setup(gras_trp_plugin_t *plug);
-xbt_error_t gras_trp_sg_setup(gras_trp_plugin_t *plug);
-xbt_error_t gras_trp_buf_setup(gras_trp_plugin_t *plug);
+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);
 
 /*
 
@@ -72,7 +77,7 @@ xbt_error_t gras_trp_buf_setup(gras_trp_plugin_t *plug);
   manually do deal with the weirdness of the hostdata, themselves here to deal
   with the weird channel concept of SG and convert them back to ports.
   
-  When introducing buffered transport (whith I want to get used in SG to debug
+  When introducing buffered transport (which I want to get used in SG to debug
   the buffering itself), we should not make the rest of the code aware of the
   change and not specify code for this. This is bad design.
   
@@ -84,14 +89,6 @@ xbt_error_t gras_trp_buf_setup(gras_trp_plugin_t *plug);
 
 */
 
-void gras_trp_buf_init_sock(gras_socket_t sock);
-
-
-/* Data exchange over raw sockets */
-xbt_error_t gras_socket_raw_exchange(gras_socket_t peer,
-                                     int sender,
-                                     unsigned int timeout,
-                                     unsigned long int expSize,
-                                     unsigned long int msgSize);
+gras_socket_t gras_trp_buf_init_sock(gras_socket_t sock);
 
 #endif /* GRAS_TRP_PRIVATE_H */