-/* $Id$ */
+/* buf trp (transport) - buffered transport using the TCP one */
-/* tcp trp (transport) - send/receive a bunch of bytes from a tcp socket */
-
-/* Copyright (c) 2004 Martin Quinson. All rights reserved. */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2009, 2010. The SimGrid Team.
+ * 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. */
-#include <unistd.h> /* close() pipe() read() write() */
-#include <signal.h> /* close() pipe() read() write() */
-#include <netinet/in.h> /* sometimes required for #include <arpa/inet.h> */
-#include <netinet/tcp.h> /* TCP_NODELAY */
-#include <arpa/inet.h> /* inet_ntoa() */
-#include <netdb.h> /* getprotobyname() */
-#include <sys/time.h> /* struct timeval */
-#include <errno.h> /* errno */
-#include <sys/wait.h> /* waitpid() */
-#include <sys/socket.h> /* getpeername() socket() */
#include <stdlib.h>
-#include <string.h> /* memset */
-
-#include "transport_private.h"
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(trp_tcp,transport,"TCP transport");
-
-/***
- *** Prototypes
- ***/
-xbt_error_t gras_trp_tcp_socket_client(gras_trp_plugin_t *self,
- gras_socket_t sock);
-xbt_error_t gras_trp_tcp_socket_server(gras_trp_plugin_t *self,
- gras_socket_t sock);
-xbt_error_t gras_trp_tcp_socket_accept(gras_socket_t sock,
- gras_socket_t *dst);
+#include <string.h> /* memset */
-void gras_trp_tcp_socket_close(gras_socket_t sd);
-
-xbt_error_t gras_trp_tcp_chunk_send(gras_socket_t sd,
- const char *data,
- long int size);
+#include "portable.h"
+#include "xbt/misc.h"
+#include "xbt/sysdep.h"
+#include "xbt/ex.h"
+#include "gras/Transport/transport_private.h"
+#include "gras/Msg/msg_interface.h" /* listener_close_socket */
-xbt_error_t gras_trp_tcp_chunk_recv(gras_socket_t sd,
- char *data,
- long int size);
+/* FIXME maybe READV is sometime a good thing? */
+#undef HAVE_READV
-void gras_trp_tcp_exit(gras_trp_plugin_t *plug);
+#ifdef HAVE_READV
+#include <sys/uio.h>
+#endif
+#ifndef MIN
+#define MIN(a,b) ((a)<(b)?(a):(b))
+#endif
-static int TcpProtoNumber(void);
-/***
- *** Specific plugin part
- ***/
-
-typedef struct {
- fd_set msg_socks;
- fd_set raw_socks;
-} gras_trp_tcp_plug_data_t;
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_trp_tcp, gras_trp,
+ "TCP buffered transport");
/***
*** Specific socket part
***/
typedef struct {
- int buffsize;
-} gras_trp_tcp_sock_data_t;
-
+ 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 */
+} s_gras_trp_tcp_sock_data_t, *gras_trp_tcp_sock_data_t;
-/***
- *** Code
- ***/
-xbt_error_t gras_trp_tcp_setup(gras_trp_plugin_t *plug) {
-
- gras_trp_tcp_plug_data_t *data = xbt_new(gras_trp_tcp_plug_data_t,1);
-
- FD_ZERO(&(data->msg_socks));
- FD_ZERO(&(data->raw_socks));
-
- plug->socket_client = gras_trp_tcp_socket_client;
- plug->socket_server = gras_trp_tcp_socket_server;
- plug->socket_accept = gras_trp_tcp_socket_accept;
- plug->socket_close = gras_trp_tcp_socket_close;
+typedef enum { buffering_buf, buffering_iov } buffering_kind;
- plug->chunk_send = gras_trp_tcp_chunk_send;
- plug->chunk_recv = gras_trp_tcp_chunk_recv;
-
- plug->flush = NULL; /* nothing's cached */
-
- plug->data = (void*)data;
- plug->exit = gras_trp_tcp_exit;
+typedef struct {
+ int size;
+ char *data;
+ int pos; /* for receive; not exchanged over the net */
+} gras_trp_buf_t;
- return no_error;
-}
-void gras_trp_tcp_exit(gras_trp_plugin_t *plug) {
- DEBUG1("Exit plugin TCP (free %p)", plug->data);
- xbt_free(plug->data);
-}
+struct gras_trp_bufdata_ {
+ int buffsize;
+ gras_trp_buf_t in_buf;
+ gras_trp_buf_t out_buf;
+
+#ifdef HAVE_READV
+ xbt_dynar_t in_buf_v;
+ xbt_dynar_t out_buf_v;
+#endif
+
+ buffering_kind in;
+ buffering_kind out;
+};
+
+
+/*****************************/
+/****[ SOCKET MANAGEMENT ]****/
+/*****************************/
+/* we exchange port number on client side on socket creation,
+ so we need to be able to talk right now. */
+static XBT_INLINE void gras_trp_tcp_send(gras_socket_t sock,
+ const char *data,
+ unsigned long int size);
+static int gras_trp_tcp_recv(gras_socket_t sock, char *data,
+ unsigned long int size);
+
+
+static int _gras_tcp_proto_number(void);
+
+static XBT_INLINE
+void gras_trp_sock_socket_client(gras_trp_plugin_t ignored,
+ const char *host,
+ int port,
+ /*OUT*/gras_socket_t sock)
+{
+ gras_trp_tcp_sock_data_t sockdata = xbt_new(s_gras_trp_tcp_sock_data_t,1);
+ sockdata->port = port;
+ sockdata->peer_proc = NULL;
+ sockdata->peer_port = port;
+ sockdata->peer_name = (char *) strdup(host ? host : "localhost");
+ sock->data = sockdata;
-xbt_error_t gras_trp_tcp_socket_client(gras_trp_plugin_t *self,
- gras_socket_t sock){
-
struct sockaddr_in addr;
struct hostent *he;
struct in_addr *haddr;
- int size = sock->bufSize * 1024;
+ int size = sock->buf_size;
+ uint32_t myport = htonl(((gras_trp_procdata_t)
+ gras_libdata_by_id
+ (gras_trp_libdata_id))->myport);
+
+ sock->incoming = 1; /* TCP sockets are duplex'ed */
- sock->incoming = 1; /* TCP sockets are duplex'ed */
+ sock->sd = socket(AF_INET, SOCK_STREAM, 0);
- sock->sd = socket (AF_INET, SOCK_STREAM, 0);
-
if (sock->sd < 0) {
- RAISE1(system_error,
- "Failed to create socket: %s",
- strerror (errno));
+ THROW1(system_error, 0, "Failed to create socket: %s",
+ sock_errstr(sock_errno));
}
- if (setsockopt(sock->sd, SOL_SOCKET, SO_RCVBUF, (char *)&size, sizeof(size)) ||
- setsockopt(sock->sd, SOL_SOCKET, SO_SNDBUF, (char *)&size, sizeof(size))) {
- WARN1("setsockopt failed, cannot set buffer size: %s",
- strerror(errno));
+ if (setsockopt
+ (sock->sd, SOL_SOCKET, SO_RCVBUF, (char *) &size, sizeof(size))
+ || setsockopt(sock->sd, SOL_SOCKET, SO_SNDBUF, (char *) &size,
+ sizeof(size))) {
+ VERB1("setsockopt failed, cannot set buffer size: %s",
+ sock_errstr(sock_errno));
}
-
- he = gethostbyname (sock->peer_name);
+
+ he = gethostbyname(sockdata->peer_name);
if (he == NULL) {
- RAISE2(system_error,
- "Failed to lookup hostname %s: %s",
- sock->peer_name, strerror (errno));
+ THROW2(system_error, 0, "Failed to lookup hostname %s: %s",
+ sockdata->peer_name, sock_errstr(sock_errno));
}
-
+
haddr = ((struct in_addr *) (he->h_addr_list)[0]);
-
+
memset(&addr, 0, sizeof(struct sockaddr_in));
- memcpy (&addr.sin_addr, haddr, sizeof(struct in_addr));
+ memcpy(&addr.sin_addr, haddr, sizeof(struct in_addr));
addr.sin_family = AF_INET;
- addr.sin_port = htons (sock->peer_port);
+ addr.sin_port = htons(sockdata->peer_port);
- if (connect (sock->sd, (struct sockaddr*) &addr, sizeof (addr)) < 0) {
- close(sock->sd);
- RAISE3(system_error,
- "Failed to connect socket to %s:%d (%s)",
- sock->peer_name, sock->peer_port, strerror (errno));
+ if (connect(sock->sd, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
+ tcp_close(sock->sd);
+ THROW3(system_error, 0,
+ "Failed to connect socket to %s:%d (%s)",
+ sockdata->peer_name, sockdata->peer_port, sock_errstr(sock_errno));
}
-
- return no_error;
+
+ gras_trp_tcp_send(sock, (char *) &myport, sizeof(uint32_t));
+ DEBUG1("peerport sent to %d", sockdata->peer_port);
+
+ VERB4("Connect to %s:%d (sd=%d, port %d here)",
+ sockdata->peer_name, sockdata->peer_port, sock->sd, sockdata->port);
}
/**
- * gras_trp_tcp_socket_server:
+ * gras_trp_sock_socket_server:
*
* Open a socket used to receive messages.
*/
-xbt_error_t gras_trp_tcp_socket_server(gras_trp_plugin_t *self,
- /* OUT */ gras_socket_t sock){
- int size = sock->bufSize * 1024;
+static XBT_INLINE
+void gras_trp_sock_socket_server(gras_trp_plugin_t ignored,
+ int port,
+ gras_socket_t sock)
+{
+ int size = sock->buf_size;
int on = 1;
struct sockaddr_in server;
- gras_trp_tcp_plug_data_t *tcp=(gras_trp_tcp_plug_data_t*)self->data;
-
- sock->outgoing = 1; /* TCP => duplex mode */
+ gras_trp_tcp_sock_data_t sockdata = xbt_new(s_gras_trp_tcp_sock_data_t,1);
+ sockdata->port = port;
+ sockdata->peer_port = -1;
+ sockdata->peer_name = NULL;
+ sockdata->peer_proc = NULL;
+ sock->data=sockdata;
+
+ sock->outgoing = 1; /* TCP => duplex mode */
- server.sin_port = htons((u_short)sock->port);
+ server.sin_port = htons((u_short) sockdata->port);
server.sin_addr.s_addr = INADDR_ANY;
server.sin_family = AF_INET;
- if((sock->sd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
- RAISE1(system_error,"Socket allocation failed: %s", strerror(errno));
+ if ((sock->sd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
+ THROW1(system_error, 0, "Socket allocation failed: %s",
+ sock_errstr(sock_errno));
+
+ if (setsockopt
+ (sock->sd, SOL_SOCKET, SO_REUSEADDR, (char *) &on, sizeof(on)))
+ THROW1(system_error, 0,
+ "setsockopt failed, cannot condition the socket: %s",
+ sock_errstr(sock_errno));
+
+ if (setsockopt(sock->sd, SOL_SOCKET, SO_RCVBUF,
+ (char *) &size, sizeof(size))
+ || setsockopt(sock->sd, SOL_SOCKET, SO_SNDBUF,
+ (char *) &size, sizeof(size))) {
+ VERB1("setsockopt failed, cannot set buffer size: %s",
+ sock_errstr(sock_errno));
}
- if (setsockopt(sock->sd, SOL_SOCKET, SO_REUSEADDR, (char *)&on, sizeof(on))) {
- RAISE1(system_error,"setsockopt failed, cannot condition the socket: %s",
- strerror(errno));
- }
-
- if (setsockopt(sock->sd, SOL_SOCKET, SO_RCVBUF, (char *)&size, sizeof(size)) ||
- setsockopt(sock->sd, SOL_SOCKET, SO_SNDBUF, (char *)&size, sizeof(size))) {
- WARN1("setsockopt failed, cannot set buffer size: %s",
- strerror(errno));
- }
-
- if (bind(sock->sd, (struct sockaddr *)&server, sizeof(server)) == -1) {
- close(sock->sd);
- RAISE2(system_error,"Cannot bind to port %d: %s",sock->port, strerror(errno));
+ if (bind(sock->sd, (struct sockaddr *) &server, sizeof(server)) == -1) {
+ tcp_close(sock->sd);
+ THROW2(system_error, 0,
+ "Cannot bind to port %d: %s", sockdata->port,
+ sock_errstr(sock_errno));
}
+ DEBUG2("Listen on port %d (sd=%d)", sockdata->port, sock->sd);
if (listen(sock->sd, 5) < 0) {
- close(sock->sd);
- RAISE2(system_error,"Cannot listen to port %d: %s",sock->port,strerror(errno));
+ tcp_close(sock->sd);
+ THROW2(system_error, 0,
+ "Cannot listen on port %d: %s",
+ sockdata->port, sock_errstr(sock_errno));
}
- if (sock->raw)
- FD_SET(sock->sd, &(tcp->raw_socks));
- else
- FD_SET(sock->sd, &(tcp->msg_socks));
-
- DEBUG2("Openned a server socket on port %d (sock %d)",sock->port,sock->sd);
-
- return no_error;
+ VERB2("Openned a server socket on port %d (sd=%d)", sockdata->port,
+ sock->sd);
}
-xbt_error_t
-gras_trp_tcp_socket_accept(gras_socket_t sock,
- gras_socket_t *dst) {
+static gras_socket_t gras_trp_sock_socket_accept(gras_socket_t sock)
+{
gras_socket_t res;
-
+
struct sockaddr_in peer_in;
socklen_t peer_in_len = sizeof(peer_in);
int sd;
int tmp_errno;
int size;
-
- gras_trp_socket_new(1,&res);
- sd = accept(sock->sd, (struct sockaddr *)&peer_in, &peer_in_len);
- tmp_errno = errno;
+ int i = 1;
+ socklen_t s = sizeof(int);
- if(sd == -1) {
+ uint32_t hisport;
+
+ XBT_IN;
+ gras_trp_socket_new(1, &res);
+
+ sd = accept(sock->sd, (struct sockaddr *) &peer_in, &peer_in_len);
+ tmp_errno = sock_errno;
+
+ if (sd == -1) {
gras_socket_close(sock);
- RAISE1(system_error,
- "Accept failed (%s). Droping server socket.", strerror(tmp_errno));
+ THROW1(system_error, 0,
+ "Accept failed (%s). Droping server socket.",
+ sock_errstr(tmp_errno));
+ }
+
+ if (setsockopt(sd, SOL_SOCKET, SO_KEEPALIVE, (char *) &i, s)
+ || setsockopt(sd, _gras_tcp_proto_number(), TCP_NODELAY, (char *) &i,
+ s))
+ THROW1(system_error, 0,
+ "setsockopt failed, cannot condition the socket: %s",
+ sock_errstr(tmp_errno));
+
+ res->buf_size = sock->buf_size;
+ size = sock->buf_size;
+ if (setsockopt(sd, SOL_SOCKET, SO_RCVBUF, (char *) &size, sizeof(size))
+ || setsockopt(sd, SOL_SOCKET, SO_SNDBUF, (char *) &size,
+ sizeof(size)))
+ VERB1("setsockopt failed, cannot set buffer size: %s",
+ sock_errstr(tmp_errno));
+
+ res->plugin = sock->plugin;
+ res->incoming = sock->incoming;
+ res->outgoing = sock->outgoing;
+ res->accepting = 0;
+ res->sd = sd;
+ gras_trp_tcp_sock_data_t sockdata = xbt_new(s_gras_trp_tcp_sock_data_t,1);
+ sockdata->port = -1;
+ res->data=sockdata;
+
+
+ gras_trp_tcp_recv(res, (char *) &hisport, sizeof(hisport));
+ sockdata->peer_port = ntohl(hisport);
+ DEBUG1("peerport %d received", sockdata->peer_port);
+
+ /* FIXME: Lock to protect inet_ntoa */
+ if (((struct sockaddr *) &peer_in)->sa_family != AF_INET) {
+ sockdata->peer_name = (char *) strdup("unknown");
} else {
- int i = 1;
- socklen_t s = sizeof(int);
-
- if (setsockopt(sd, SOL_SOCKET, SO_KEEPALIVE, (char *)&i, s)
- || setsockopt(sd, TcpProtoNumber(), TCP_NODELAY, (char *)&i, s)) {
- RAISE1(system_error,"setsockopt failed, cannot condition the socket: %s",
- strerror(errno));
+ struct in_addr addrAsInAddr;
+ char *tmp;
+
+ addrAsInAddr.s_addr = peer_in.sin_addr.s_addr;
+
+ tmp = inet_ntoa(addrAsInAddr);
+ if (tmp != NULL) {
+ sockdata->peer_name = (char *) strdup(tmp);
+ } else {
+ sockdata->peer_name = (char *) strdup("unknown");
}
-
- (*dst)->bufSize = sock->bufSize;
- size = sock->bufSize * 1024;
- if (setsockopt(sd, SOL_SOCKET, SO_RCVBUF, (char *)&size, sizeof(size))
- || setsockopt(sd, SOL_SOCKET, SO_SNDBUF, (char *)&size, sizeof(size))) {
- WARN1("setsockopt failed, cannot set buffer size: %s",
- strerror(errno));
+ }
+
+ VERB3("Accepted from %s:%d (sd=%d)", sockdata->peer_name, sockdata->peer_port, sd);
+ xbt_dynar_push(((gras_trp_procdata_t)
+ gras_libdata_by_id(gras_trp_libdata_id))->sockets, &res);
+
+ XBT_OUT;
+ return res;
+}
+
+static void gras_trp_sock_socket_close(gras_socket_t sock)
+{
+
+ if (!sock)
+ return; /* close only once */
+
+ if (((gras_trp_tcp_sock_data_t)sock->data)->peer_name)
+ free(((gras_trp_tcp_sock_data_t)sock->data)->peer_name);
+ free(sock->data);
+
+ VERB1("close tcp connection %d", sock->sd);
+
+ /* ask the listener to close the socket */
+ gras_msg_listener_close_socket(sock->sd);
+}
+
+/************************************/
+/****[ end of SOCKET MANAGEMENT ]****/
+/************************************/
+
+
+/************************************/
+/****[ UNBUFFERED DATA EXCHANGE ]****/
+/************************************/
+/* Temptation to merge this with file data exchange is great,
+ but doesn't work on BillWare (see tcp_write() in portable.h) */
+static XBT_INLINE void gras_trp_tcp_send(gras_socket_t sock,
+ const char *data,
+ unsigned long int size)
+{
+
+ while (size) {
+ int status = 0;
+
+ status = tcp_write(sock->sd, data, (size_t) size);
+ DEBUG3("write(%d, %p, %ld);", sock->sd, data, size);
+
+ if (status < 0) {
+#ifdef EWOULDBLOCK
+ if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)
+#else
+ if (errno == EINTR || errno == EAGAIN)
+#endif
+ continue;
+
+ THROW4(system_error, 0, "write(%d,%p,%ld) failed: %s",
+ sock->sd, data, size, sock_errstr(sock_errno));
}
-
- res->plugin = sock->plugin;
- res->incoming = sock->incoming;
- res->outgoing = sock->outgoing;
- res->accepting = 0;
- res->sd = sd;
- res->port = -1;
- res->peer_port = peer_in.sin_port;
-
- /* FIXME: Lock to protect inet_ntoa */
- if (((struct sockaddr *)&peer_in)->sa_family != AF_INET) {
- res->peer_name = (char*)strdup("unknown");
+
+ if (status) {
+ size -= status;
+ data += status;
} else {
- struct in_addr addrAsInAddr;
- char *tmp;
-
- addrAsInAddr.s_addr = peer_in.sin_addr.s_addr;
-
- tmp = inet_ntoa(addrAsInAddr);
- if (tmp != NULL) {
- res->peer_name = (char*)strdup(tmp);
- } else {
- res->peer_name = (char*)strdup("unknown");
- }
+ THROW1(system_error, 0, "file descriptor closed (%s)",
+ sock_errstr(sock_errno));
}
+ }
+}
+
+static XBT_INLINE int
+gras_trp_tcp_recv_withbuffer(gras_socket_t sock,
+ char *data,
+ unsigned long int size,
+ unsigned long int bufsize)
+{
- VERB3("accepted socket %d to %s:%d", sd, res->peer_name,res->peer_port);
-
- *dst = res;
+ int got = 0;
- return no_error;
+ if (sock->recvd) {
+ data[0] = sock->recvd_val;
+ sock->recvd = 0;
+ got++;
+ bufsize--;
}
+
+ while (size > got) {
+ int status = 0;
+
+ DEBUG5("read(%d, %p, %ld) got %d so far (%s)",
+ sock->sd, data + got, bufsize, got,
+ hexa_str((unsigned char *) data, got, 0));
+ status = tcp_read(sock->sd, data + got, (size_t) bufsize);
+
+ if (status < 0) {
+ THROW7(system_error, 0,
+ "read(%d,%p,%d) from %s:%d failed: %s; got %d so far",
+ sock->sd, data + got, (int) size, gras_socket_peer_name(sock),
+ gras_socket_peer_port(sock), sock_errstr(sock_errno), got);
+ }
+ DEBUG2("Got %d more bytes (%s)", status,
+ hexa_str((unsigned char *) data + got, status, 0));
+
+ if (status) {
+ bufsize -= status;
+ got += status;
+ } else {
+ THROW1(system_error, errno,
+ "Socket closed by remote side (got %d bytes before this)",
+ got);
+ }
+ }
+
+ return got;
+}
+
+static int gras_trp_tcp_recv(gras_socket_t sock,
+ char *data, unsigned long int size)
+{
+ return gras_trp_tcp_recv_withbuffer(sock, data, size, size);
+
}
-void gras_trp_tcp_socket_close(gras_socket_t sock){
- gras_trp_tcp_plug_data_t *tcp;
-
- if (!sock) return; /* close only once */
- tcp=sock->plugin->data;
-
- DEBUG1("close tcp connection %d", sock->sd);
-
- /* FIXME: no pipe in GRAS so far
- if(!FD_ISSET(sd, &connectedPipes)) {
- if(shutdown(sd, 2) < 0) {
- GetNWSLock(&lock);
- tmp_errno = errno;
- ReleaseNWSLock(&lock);
-
- / * The other side may have beaten us to the reset. * /
- if ((tmp_errno!=ENOTCONN) && (tmp_errno!=ECONNRESET)) {
- WARN1("CloseSocket: shutdown error %d\n", tmp_errno);
- }
+/*******************************************/
+/****[ end of UNBUFFERED DATA EXCHANGE ]****/
+/*******************************************/
+
+/**********************************/
+/****[ BUFFERED DATA EXCHANGE ]****/
+/**********************************/
+
+/* Make sure the data is sent */
+static void gras_trp_bufiov_flush(gras_socket_t sock)
+{
+#ifdef HAVE_READV
+ xbt_dynar_t vect;
+ int size;
+#endif
+ gras_trp_bufdata_t *data = sock->bufdata;
+ XBT_IN;
+
+ DEBUG0("Flush");
+ if (data->out == buffering_buf) {
+ if (XBT_LOG_ISENABLED(gras_trp_tcp, xbt_log_priority_debug))
+ hexa_print("chunk to send ",
+ (unsigned char *) data->out_buf.data, data->out_buf.size);
+ if ((data->out_buf.size - data->out_buf.pos) != 0) {
+ DEBUG3("Send the chunk (size=%d) to %s:%d", data->out_buf.size,
+ gras_socket_peer_name(sock), gras_socket_peer_port(sock));
+ gras_trp_tcp_send(sock, data->out_buf.data, data->out_buf.size);
+ VERB1("Chunk sent (size=%d)", data->out_buf.size);
+ data->out_buf.size = 0;
+ }
+ }
+#ifdef HAVE_READV
+ if (data->out == buffering_iov) {
+ DEBUG0("Flush out iov");
+ vect = sock->bufdata->out_buf_v;
+ if ((size = xbt_dynar_length(vect))) {
+ DEBUG1("Flush %d chunks out of this socket", size);
+ writev(sock->sd, xbt_dynar_get_ptr(vect, 0), size);
+ xbt_dynar_reset(vect);
}
- } */
-
- /* forget about the socket */
- if (sock->raw)
- FD_CLR(sock->sd, &(tcp->raw_socks));
- else
- FD_CLR(sock->sd, &(tcp->msg_socks));
-
- /* close the socket */
- if(close(sock->sd) < 0) {
- WARN3("error while closing tcp socket %d: %d (%s)\n",
- sock->sd, errno, strerror(errno));
+ data->out_buf.size = 0; /* reset the buffer containing non-stable data */
}
+
+ if (data->in == buffering_iov) {
+ DEBUG0("Flush in iov");
+ vect = sock->bufdata->in_buf_v;
+ if ((size = xbt_dynar_length(vect))) {
+ DEBUG1("Get %d chunks from of this socket", size);
+ readv(sock->sd, xbt_dynar_get_ptr(vect, 0), size);
+ xbt_dynar_reset(vect);
+ }
+ }
+#endif
}
-/**
- * gras_trp_tcp_chunk_send:
- *
- * Send data on a TCP socket
- */
-xbt_error_t
-gras_trp_tcp_chunk_send(gras_socket_t sock,
- const char *data,
- long int size) {
-
- /* TCP sockets are in duplex mode, don't check direction */
- xbt_assert0(size >= 0, "Cannot send a negative amount of data");
+static void
+gras_trp_buf_send(gras_socket_t sock,
+ const char *chunk,
+ unsigned long int size, int stable_ignored)
+{
+
+ gras_trp_bufdata_t *data = (gras_trp_bufdata_t *) sock->bufdata;
+ int chunk_pos = 0;
+
+ XBT_IN;
+
+ while (chunk_pos < size) {
+ /* size of the chunk to receive in that shot */
+ long int thissize =
+ min(size - chunk_pos, data->buffsize - data->out_buf.size);
+ DEBUG4("Set the chars %d..%ld into the buffer; size=%ld, ctn=(%s)",
+ (int) data->out_buf.size,
+ ((int) data->out_buf.size) + thissize - 1, size,
+ hexa_str((unsigned char *) chunk, thissize, 0));
+
+ memcpy(data->out_buf.data + data->out_buf.size, chunk + chunk_pos,
+ thissize);
+
+ data->out_buf.size += thissize;
+ chunk_pos += thissize;
+ DEBUG4("New pos = %d; Still to send = %ld of %ld; ctn sofar=(%s)",
+ data->out_buf.size, size - chunk_pos, size,
+ hexa_str((unsigned char *) chunk, chunk_pos, 0));
+
+ if (data->out_buf.size == data->buffsize) /* out of space. Flush it */
+ gras_trp_bufiov_flush(sock);
+ }
- while (size) {
- int status = 0;
-
- status = write(sock->sd, data, (size_t)size);
- DEBUG3("write(%d, %p, %ld);", sock->sd, data, size);
-
- if (status == -1) {
- RAISE4(system_error,"write(%d,%p,%ld) failed: %s",
- sock->sd, data, size,
- strerror(errno));
+ XBT_OUT;
+}
+
+static int
+gras_trp_buf_recv(gras_socket_t sock, char *chunk, unsigned long int size)
+{
+
+ gras_trp_bufdata_t *data = sock->bufdata;
+ long int chunk_pos = 0;
+
+ XBT_IN;
+
+ while (chunk_pos < size) {
+ /* size of the chunk to receive in that shot */
+ long int thissize;
+
+ if (data->in_buf.size == data->in_buf.pos) { /* out of data. Get more */
+
+ DEBUG2("Get more data (size=%d,bufsize=%d)",
+ (int) MIN(size - chunk_pos, data->buffsize),
+ (int) data->buffsize);
+
+
+ data->in_buf.size =
+ gras_trp_tcp_recv_withbuffer(sock, data->in_buf.data,
+ MIN(size - chunk_pos,
+ data->buffsize),
+ data->buffsize);
+
+ data->in_buf.pos = 0;
}
-
- if (status) {
- size -= status;
- data += status;
+
+ thissize = min(size - chunk_pos, data->in_buf.size - data->in_buf.pos);
+ memcpy(chunk + chunk_pos, data->in_buf.data + data->in_buf.pos,
+ thissize);
+
+ data->in_buf.pos += thissize;
+ chunk_pos += thissize;
+ DEBUG4("New pos = %d; Still to receive = %ld of %ld. Ctn so far=(%s)",
+ data->in_buf.pos, size - chunk_pos, size,
+ hexa_str((unsigned char *) chunk, chunk_pos, 0));
+ }
+ /* indicate on need to the gras_select function that there is more to read on this socket so that it does not actually select */
+ sock->moredata = (data->in_buf.size > data->in_buf.pos);
+ DEBUG1("There is %smore data", (sock->moredata ? "" : "no "));
+
+ XBT_OUT;
+ return chunk_pos;
+}
+
+/*****************************************/
+/****[ end of BUFFERED DATA EXCHANGE ]****/
+/*****************************************/
+
+/********************************/
+/****[ VECTOR DATA EXCHANGE ]****/
+/********************************/
+#ifdef HAVE_READV
+static void
+gras_trp_iov_send(gras_socket_t sock,
+ const char *chunk, unsigned long int size, int stable)
+{
+ struct iovec elm;
+ gras_trp_bufdata_t *data = (gras_trp_bufdata_t *) sock->bufdata;
+
+
+ DEBUG1("Buffer one chunk to be sent later (%s)",
+ hexa_str((char *) chunk, size, 0));
+
+ elm.iov_len = (size_t) size;
+
+ if (!stable) {
+ /* data storage won't last until flush. Save it in a buffer if we can */
+
+ if (size > data->buffsize - data->out_buf.size) {
+ /* buffer too small:
+ flush the socket, using data in its actual storage */
+ elm.iov_base = (void *) chunk;
+ xbt_dynar_push(data->out_buf_v, &elm);
+
+ gras_trp_bufiov_flush(sock);
+ return;
} else {
- RAISE0(system_error,"file descriptor closed");
+ /* buffer big enough:
+ copy data into it, and chain it for upcoming writev */
+ memcpy(data->out_buf.data + data->out_buf.size, chunk, size);
+ elm.iov_base = (void *) (data->out_buf.data + data->out_buf.size);
+ data->out_buf.size += size;
+
+ xbt_dynar_push(data->out_buf_v, &elm);
}
+
+ } else {
+ /* data storage stable. Chain it */
+
+ elm.iov_base = (void *) chunk;
+ xbt_dynar_push(data->out_buf_v, &elm);
}
+}
+
+static int
+gras_trp_iov_recv(gras_socket_t sock, char *chunk, unsigned long int size)
+{
+ struct iovec elm;
- return no_error;
+ DEBUG0("Buffer one chunk to be received later");
+ elm.iov_base = (void *) chunk;
+ elm.iov_len = (size_t) size;
+ xbt_dynar_push(sock->bufdata->in_buf_v, &elm);
+
+ return size;
}
+
+#endif
+/***************************************/
+/****[ end of VECTOR DATA EXCHANGE ]****/
+/***************************************/
+
+
+/***
+ *** Prototypes of BUFFERED
+ ***/
+
+void gras_trp_buf_socket_client(gras_trp_plugin_t self,
+ const char *host,
+ int port,
+ gras_socket_t sock);
+void gras_trp_buf_socket_server(gras_trp_plugin_t self,
+ int port,
+ gras_socket_t sock);
+gras_socket_t gras_trp_buf_socket_accept(gras_socket_t sock);
+
+void gras_trp_buf_socket_close(gras_socket_t sd);
+
+
+gras_socket_t gras_trp_buf_init_sock(gras_socket_t sock)
+{
+ gras_trp_bufdata_t *data = xbt_new(gras_trp_bufdata_t, 1);
+
+ data->buffsize = 100 * 1024; /* 100k */
+
+ data->in_buf.size = 0;
+ data->in_buf.data = xbt_malloc(data->buffsize);
+ data->in_buf.pos = 0; /* useless, indeed, since size==pos */
+
+ data->out_buf.size = 0;
+ data->out_buf.data = xbt_malloc(data->buffsize);
+ data->out_buf.pos = data->out_buf.size;
+
+#ifdef HAVE_READV
+ data->in_buf_v = data->out_buf_v = NULL;
+ data->in_buf_v = xbt_dynar_new(sizeof(struct iovec), NULL);
+ data->out_buf_v = xbt_dynar_new(sizeof(struct iovec), NULL);
+ data->out = buffering_iov;
+#else
+ data->out = buffering_buf;
+#endif
+
+ data->in = buffering_buf;
+
+ sock->bufdata = data;
+ return sock;
+}
+
+/***
+ *** Info about who's speaking
+ ***/
+static int gras_trp_tcp_my_port(gras_socket_t s) {
+ gras_trp_tcp_sock_data_t sockdata = s->data;
+ return sockdata->port;
+}
+static int gras_trp_tcp_peer_port(gras_socket_t s) {
+ gras_trp_tcp_sock_data_t sockdata = s->data;
+ return sockdata->peer_port;
+}
+static const char* gras_trp_tcp_peer_name(gras_socket_t s) {
+ gras_trp_tcp_sock_data_t sockdata = s->data;
+ return sockdata->peer_name;
+}
+static const char* gras_trp_tcp_peer_proc(gras_socket_t s) {
+ gras_trp_tcp_sock_data_t sockdata = s->data;
+ return sockdata->peer_proc;
+}
+static void gras_trp_tcp_peer_proc_set(gras_socket_t s,char *name) {
+ gras_trp_tcp_sock_data_t sockdata = s->data;
+ sockdata->peer_proc = xbt_strdup(name);
+}
+
+/***
+ *** Code
+ ***/
+void gras_trp_tcp_setup(gras_trp_plugin_t plug)
+{
+
+ plug->my_port = gras_trp_tcp_my_port;
+ plug->peer_port = gras_trp_tcp_peer_port;
+ plug->peer_name = gras_trp_tcp_peer_name;
+ plug->peer_proc = gras_trp_tcp_peer_proc;
+ plug->peer_proc_set = gras_trp_tcp_peer_proc_set;
+
+
+ plug->socket_client = gras_trp_buf_socket_client;
+ plug->socket_server = gras_trp_buf_socket_server;
+ plug->socket_accept = gras_trp_buf_socket_accept;
+ plug->socket_close = gras_trp_buf_socket_close;
+
+#ifdef HAVE_READV
+ plug->send = gras_trp_iov_send;
+#else
+ plug->send = gras_trp_buf_send;
+#endif
+ plug->recv = gras_trp_buf_recv;
+
+ plug->raw_send = gras_trp_tcp_send;
+ plug->raw_recv = gras_trp_tcp_recv;
+
+ plug->flush = gras_trp_bufiov_flush;
+
+ plug->data = NULL;
+ plug->exit = NULL;
+}
+
+void gras_trp_buf_socket_client(gras_trp_plugin_t self,
+ const char *host,
+ int port,
+ /* OUT */ gras_socket_t sock)
+{
+
+ gras_trp_sock_socket_client(NULL, host,port,sock);
+ gras_trp_buf_init_sock(sock);
+}
+
/**
- * gras_trp_tcp_chunk_recv:
+ * gras_trp_buf_socket_server:
*
- * Receive data on a TCP socket.
+ * Open a socket used to receive messages.
*/
-xbt_error_t
-gras_trp_tcp_chunk_recv(gras_socket_t sock,
- char *data,
- long int size) {
-
- /* TCP sockets are in duplex mode, don't check direction */
- xbt_assert0(sock, "Cannot recv on an NULL socket");
- xbt_assert0(size >= 0, "Cannot receive a negative amount of data");
-
- while (size) {
- int status = 0;
-
- status = read(sock->sd, data, (size_t)size);
- DEBUG3("read(%d, %p, %ld);", sock->sd, data, size);
-
- if (status == -1) {
- RAISE4(system_error,"read(%d,%p,%d) failed: %s",
- sock->sd, data, (int)size,
- strerror(errno));
- }
-
- if (status) {
- size -= status;
- data += status;
- } else {
- RAISE0(system_error,"file descriptor closed");
+void gras_trp_buf_socket_server(gras_trp_plugin_t self,
+ int port,
+ /* OUT */ gras_socket_t sock)
+{
+
+ gras_trp_sock_socket_server(NULL, port, sock);
+ gras_trp_buf_init_sock(sock);
+}
+
+gras_socket_t gras_trp_buf_socket_accept(gras_socket_t sock)
+{
+ return gras_trp_buf_init_sock(gras_trp_sock_socket_accept(sock));
+}
+
+void gras_trp_buf_socket_close(gras_socket_t sock)
+{
+ gras_trp_bufdata_t *data = sock->bufdata;
+
+ if (data->in_buf.size != data->in_buf.pos) {
+ WARN3("Socket closed, but %d bytes were unread (size=%d,pos=%d)",
+ data->in_buf.size - data->in_buf.pos,
+ data->in_buf.size, data->in_buf.pos);
+ }
+ if (data->in_buf.data)
+ free(data->in_buf.data);
+
+ if (data->out_buf.size != data->out_buf.pos) {
+ DEBUG2("Flush the socket before closing (in=%d,out=%d)",
+ data->in_buf.size, data->out_buf.size);
+ gras_trp_bufiov_flush(sock);
+ }
+ if (data->out_buf.data)
+ free(data->out_buf.data);
+
+#ifdef HAVE_READV
+ if (data->in_buf_v) {
+ if (xbt_dynar_length(data->in_buf_v))
+ WARN0("Socket closed, but some bytes were unread");
+ xbt_dynar_free(&data->in_buf_v);
+ }
+ if (data->out_buf_v) {
+ if (xbt_dynar_length(data->out_buf_v)) {
+ DEBUG0("Flush the socket before closing");
+ gras_trp_bufiov_flush(sock);
}
+ xbt_dynar_free(&data->out_buf_v);
}
-
- return no_error;
+#endif
+
+ free(data);
+ gras_trp_sock_socket_close(sock);
}
+/****************************/
+/****[ HELPER FUNCTIONS ]****/
+/****************************/
/*
* Returns the tcp protocol number from the network protocol data base.
*
* getprotobyname() is not thread safe. We need to lock it.
*/
-static int TcpProtoNumber(void) {
+static int _gras_tcp_proto_number(void)
+{
struct protoent *fetchedEntry;
static int returnValue = 0;
-
- if(returnValue == 0) {
+
+ if (returnValue == 0) {
fetchedEntry = getprotobyname("tcp");
xbt_assert0(fetchedEntry, "getprotobyname(tcp) gave NULL");
returnValue = fetchedEntry->p_proto;
}
-
+
return returnValue;
}
-/* Data exchange over raw sockets. Placing this in there is a kind of crude hack.
- It means that the only possible raw are TCP where we may want to do UDP for them.
- But I fail to find a good internal organization for now. We may want to split
- raw and regular sockets more efficiently.
-*/
-xbt_error_t gras_socket_raw_exchange(gras_socket_t peer,
- int sender,
- unsigned int timeout,
- unsigned long int exp_size,
- unsigned long int msg_size) {
- char *chunk;
- int res_last, msg_sofar, exp_sofar;
-
- fd_set rd_set;
-/* int rv; */
-
- struct timeval timeOut;
-
- chunk = xbt_malloc(msg_size);
-
- for (exp_sofar=0; exp_sofar < exp_size; exp_sofar += msg_size) {
- for(msg_sofar=0; msg_sofar < msg_size; msg_sofar += res_last) {
-
- if(sender) {
- res_last = send(peer->sd, chunk, msg_size - msg_sofar, 0);
- } else {
- res_last = 0;
- FD_ZERO(&rd_set);
- FD_SET(peer->sd,&rd_set);
- timeOut.tv_sec = timeout;
- timeOut.tv_usec = 0;
-
- if (0 < select(peer->sd+1,&rd_set,NULL,NULL,&timeOut))
- res_last = recv(peer->sd, chunk, msg_size-msg_sofar, 0);
-
- }
- if (res_last == 0) {
- /* No progress done, bail out */
- xbt_free(chunk);
- RAISE0(unknown_error,"Not exchanged a single byte, bailing out");
- }
- }
- }
-
- xbt_free(chunk);
- return no_error;
+#ifdef HAVE_WINSOCK_H
+#define RETSTR( x ) case x: return #x
+
+const char *gras_wsa_err2string(int err)
+{
+ switch (err) {
+ RETSTR(WSAEINTR);
+ RETSTR(WSAEBADF);
+ RETSTR(WSAEACCES);
+ RETSTR(WSAEFAULT);
+ RETSTR(WSAEINVAL);
+ RETSTR(WSAEMFILE);
+ RETSTR(WSAEWOULDBLOCK);
+ RETSTR(WSAEINPROGRESS);
+ RETSTR(WSAEALREADY);
+ RETSTR(WSAENOTSOCK);
+ RETSTR(WSAEDESTADDRREQ);
+ RETSTR(WSAEMSGSIZE);
+ RETSTR(WSAEPROTOTYPE);
+ RETSTR(WSAENOPROTOOPT);
+ RETSTR(WSAEPROTONOSUPPORT);
+ RETSTR(WSAESOCKTNOSUPPORT);
+ RETSTR(WSAEOPNOTSUPP);
+ RETSTR(WSAEPFNOSUPPORT);
+ RETSTR(WSAEAFNOSUPPORT);
+ RETSTR(WSAEADDRINUSE);
+ RETSTR(WSAEADDRNOTAVAIL);
+ RETSTR(WSAENETDOWN);
+ RETSTR(WSAENETUNREACH);
+ RETSTR(WSAENETRESET);
+ RETSTR(WSAECONNABORTED);
+ RETSTR(WSAECONNRESET);
+ RETSTR(WSAENOBUFS);
+ RETSTR(WSAEISCONN);
+ RETSTR(WSAENOTCONN);
+ RETSTR(WSAESHUTDOWN);
+ RETSTR(WSAETOOMANYREFS);
+ RETSTR(WSAETIMEDOUT);
+ RETSTR(WSAECONNREFUSED);
+ RETSTR(WSAELOOP);
+ RETSTR(WSAENAMETOOLONG);
+ RETSTR(WSAEHOSTDOWN);
+ RETSTR(WSAEHOSTUNREACH);
+ RETSTR(WSAENOTEMPTY);
+ RETSTR(WSAEPROCLIM);
+ RETSTR(WSAEUSERS);
+ RETSTR(WSAEDQUOT);
+ RETSTR(WSAESTALE);
+ RETSTR(WSAEREMOTE);
+ RETSTR(WSASYSNOTREADY);
+ RETSTR(WSAVERNOTSUPPORTED);
+ RETSTR(WSANOTINITIALISED);
+ RETSTR(WSAEDISCON);
+
+#ifdef HAVE_WINSOCK2
+ RETSTR(WSAENOMORE);
+ RETSTR(WSAECANCELLED);
+ RETSTR(WSAEINVALIDPROCTABLE);
+ RETSTR(WSAEINVALIDPROVIDER);
+ RETSTR(WSASYSCALLFAILURE);
+ RETSTR(WSASERVICE_NOT_FOUND);
+ RETSTR(WSATYPE_NOT_FOUND);
+ RETSTR(WSA_E_NO_MORE);
+ RETSTR(WSA_E_CANCELLED);
+ RETSTR(WSAEREFUSED);
+#endif /* HAVE_WINSOCK2 */
+
+ RETSTR(WSAHOST_NOT_FOUND);
+ RETSTR(WSATRY_AGAIN);
+ RETSTR(WSANO_RECOVERY);
+ RETSTR(WSANO_DATA);
+ }
+ return "unknown WSA error";
}
+#endif /* HAVE_WINSOCK_H */
+
+/***********************************/
+/****[ end of HELPER FUNCTIONS ]****/
+/***********************************/
