#include "xbt/sysdep.h"
#include "xbt/log.h"
-#include "xbt/error.h"
#include "xbt/dynar.h"
#include "xbt/dict.h"
#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:
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.
+ Note that measurement sockets are not concerned since they use the TCP interface directly, with no buffer. */
+
+ 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 */
gras_trp_bufdata_t *bufdata;
}s_gras_socket_t;
-void gras_trp_socket_new(int incomming,
+XBT_PUBLIC(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);
+XBT_PUBLIC(void) gras_trp_tcp_setup(gras_trp_plugin_t plug);
+XBT_PUBLIC(void) gras_trp_iov_setup(gras_trp_plugin_t plug);
+XBT_PUBLIC(void) gras_trp_file_setup(gras_trp_plugin_t plug);
+XBT_PUBLIC(void) gras_trp_sg_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);
-
-xbt_dynar_t gras_socketset_get(void); /* FIXME:KILLME */
+XBT_PUBLIC(gras_socket_t) gras_trp_buf_init_sock(gras_socket_t sock);
#endif /* GRAS_TRP_PRIVATE_H */