/* 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 <time.h> /* time() */
+#include "gras/Transport/transport_private.h"
-#include "Transport/transport_private.h"
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(transport,gras,"Conveying bytes over the network");
+XBT_LOG_NEW_SUBCATEGORY(raw_trp,transport,"Conveying bytes over the network without formating");
+static xbt_dict_t _gras_trp_plugins; /* All registered plugins */
+static void gras_trp_plugin_free(void *p); /* free one of the plugins */
-GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(transport,GRAS);
+static void
+gras_trp_plugin_new(const char *name, gras_trp_setup_t setup) {
+ xbt_error_t errcode;
-static gras_dict_t *_gras_trp_plugins; /* All registered plugins */
-static void gras_trp_plugin_free(void *p); /* free one of the plugins */
+ gras_trp_plugin_t *plug = xbt_new0(gras_trp_plugin_t, 1);
+
+ DEBUG1("Create plugin %s",name);
+ plug->name=xbt_strdup(name);
-gras_dynar_t *_gras_trp_sockets; /* all existing sockets */
-static void gras_trp_socket_free(void *s); /* free one socket */
+ errcode = setup(plug);
+ switch (errcode) {
+ case mismatch_error:
+ /* SG plugin return mismatch when in RL mode (and vice versa) */
+ xbt_free(plug->name);
+ xbt_free(plug);
+ break;
-static fd_set FDread;
+ case no_error:
+ xbt_dict_set(_gras_trp_plugins,
+ name, plug, gras_trp_plugin_free);
+ break;
-gras_error_t
-gras_trp_init(void){
- gras_error_t errcode;
- gras_trp_plugin_t *plug;
-
- /* make room for all socket ownership descriptions */
- TRY(gras_dynar_new(&_gras_trp_sockets, sizeof(gras_socket_t*), NULL));
+ default:
+ DIE_IMPOSSIBLE;
+ }
- /* We do not ear for any socket for now */
- FD_ZERO(&FDread);
-
+}
+
+void gras_trp_init(void){
/* make room for all plugins */
- TRY(gras_dict_new(&_gras_trp_plugins));
+ _gras_trp_plugins=xbt_dict_new();
- /* TCP */
- TRY(gras_trp_tcp_init(&plug));
- TRY(gras_dict_set(_gras_trp_plugins,
- plug->name, plug, gras_trp_plugin_free));
+ /* Add them */
+ gras_trp_plugin_new("tcp", gras_trp_tcp_setup);
+ gras_trp_plugin_new("file",gras_trp_file_setup);
+ gras_trp_plugin_new("sg",gras_trp_sg_setup);
- /* FILE */
- TRY(gras_trp_file_init(&plug));
- TRY(gras_dict_set(_gras_trp_plugins,
- plug->name, plug, gras_trp_plugin_free));
+ /* buf is composed, so it must come after the others */
+ gras_trp_plugin_new("buf", gras_trp_buf_setup);
- return no_error;
}
void
gras_trp_exit(void){
- gras_dict_free(&_gras_trp_plugins);
- gras_dynar_free(_gras_trp_sockets);
+ xbt_dict_free(&_gras_trp_plugins);
}
gras_trp_plugin_t *plug = p;
if (plug) {
- if (plug->free_specific && plug->specific)
- plug->free_specific(plug->specific);
+ if (plug->exit) {
+ plug->exit(plug);
+ } else if (plug->data) {
+ DEBUG1("Plugin %s lacks exit(). Free data anyway.",plug->name);
+ xbt_free(plug->data);
+ }
- free(plug->name);
- free(plug);
+ xbt_free(plug->name);
+ xbt_free(plug);
}
}
*
* Malloc a new socket, and initialize it with defaults
*/
-gras_error_t gras_trp_socket_new(int incoming,
- gras_socket_t **dst) {
+void gras_trp_socket_new(int incoming,
+ gras_socket_t *dst) {
- gras_socket_t *sock;
+ gras_socket_t sock=xbt_new0(s_gras_socket_t,1);
- if (! (sock=malloc(sizeof(gras_socket_t))) )
- RAISE_MALLOC;
+ DEBUG1("Create a new socket (%p)", (void*)sock);
sock->plugin = NULL;
sock->sd = -1;
+ sock->data = NULL;
- sock->incoming = incoming? 1:0;
- sock->outgoing = incoming? 0:1;
- sock->accepting = incoming? 1:0;
- DEBUG3("in=%c out=%c accept=%c",
- sock->incoming?'y':'n',
- sock->outgoing?'y':'n',
- sock->accepting?'y':'n');
+ sock->incoming = incoming ? 1:0;
+ sock->outgoing = incoming ? 0:1;
+ sock->accepting = incoming ? 1:0;
sock->port = -1;
sock->peer_port = -1;
sock->peer_name = NULL;
+ sock->raw = 0;
*dst = sock;
- return no_error;
+
+ xbt_dynar_push(gras_socketset_get(),dst);
}
/**
- * gras_socket_server:
+ * gras_socket_server_ext:
*
* Opens a server socket and make it ready to be listened to.
* In real life, you'll get a TCP socket.
*/
-gras_error_t
-gras_socket_server(unsigned short port,
- /* OUT */ gras_socket_t **dst) {
+xbt_error_t
+gras_socket_server_ext(unsigned short port,
+
+ unsigned long int bufSize,
+ int raw,
+
+ /* OUT */ gras_socket_t *dst) {
- gras_error_t errcode;
+ xbt_error_t errcode;
gras_trp_plugin_t *trp;
- gras_socket_t *sock;
+ gras_socket_t sock;
*dst = NULL;
- TRY(gras_trp_plugin_get_by_name(gras_if_RL() ? "TCP" : "SG",
- &trp));
+ DEBUG2("Create a server socket from plugin %s on port %d",
+ gras_if_RL() ? "tcp" : "sg",
+ port);
+ TRY(gras_trp_plugin_get_by_name("buf",&trp));
/* defaults settings */
- TRY(gras_trp_socket_new(1,&sock));
+ gras_trp_socket_new(1,&sock);
sock->plugin= trp;
sock->port=port;
+ sock->bufSize = bufSize;
+ sock->raw = raw;
/* Call plugin socket creation function */
- errcode = trp->socket_server(trp, port, sock);
+ errcode = trp->socket_server(trp, sock);
+ DEBUG3("in=%c out=%c accept=%c",
+ sock->incoming?'y':'n',
+ sock->outgoing?'y':'n',
+ sock->accepting?'y':'n');
+
if (errcode != no_error) {
- free(sock);
+ xbt_free(sock);
return errcode;
}
*dst = sock;
- /* Register this socket */
- errcode = gras_dynar_push(_gras_trp_sockets,dst);
- if (errcode != no_error) {
- free(sock);
- *dst = NULL;
- return errcode;
- }
return no_error;
}
-
+
/**
- * gras_socket_client:
+ * gras_socket_client_ext:
*
* Opens a client socket to a remote host.
* In real life, you'll get a TCP socket.
*/
-gras_error_t
-gras_socket_client(const char *host,
- unsigned short port,
- /* OUT */ gras_socket_t **dst) {
+xbt_error_t
+gras_socket_client_ext(const char *host,
+ unsigned short port,
+
+ unsigned long int bufSize,
+ int raw,
+
+ /* OUT */ gras_socket_t *dst) {
- gras_error_t errcode;
+ xbt_error_t errcode;
gras_trp_plugin_t *trp;
- gras_socket_t *sock;
+ gras_socket_t sock;
*dst = NULL;
- TRY(gras_trp_plugin_get_by_name(gras_if_RL() ? "TCP" : "SG",
- &trp));
+ TRY(gras_trp_plugin_get_by_name("buf",&trp));
+ DEBUG1("Create a client socket from plugin %s",gras_if_RL() ? "tcp" : "sg");
/* defaults settings */
- TRY(gras_trp_socket_new(0,&sock));
+ gras_trp_socket_new(0,&sock);
sock->plugin= trp;
sock->peer_port = port;
- sock->peer_name = strdup(host?host:"localhost");
+ sock->peer_name = (char*)strdup(host?host:"localhost");
+ sock->bufSize = bufSize;
+ sock->raw = raw;
/* plugin-specific */
- errcode= (* trp->socket_client)(trp,
- host ? host : "localhost", port,
- sock);
+ errcode= (*trp->socket_client)(trp, sock);
+ DEBUG3("in=%c out=%c accept=%c",
+ sock->incoming?'y':'n',
+ sock->outgoing?'y':'n',
+ sock->accepting?'y':'n');
+
if (errcode != no_error) {
- free(sock);
+ xbt_free(sock);
return errcode;
}
- /* register socket */
*dst = sock;
- errcode = gras_dynar_push(_gras_trp_sockets,dst);
- if (errcode != no_error) {
- free(sock);
- *dst = NULL;
- return errcode;
- }
return no_error;
}
-void gras_socket_close(gras_socket_t **sock) {
- gras_socket_t *sock_iter;
+/**
+ * gras_socket_server:
+ *
+ * Opens a server socket and make it ready to be listened to.
+ * In real life, you'll get a TCP socket.
+ */
+xbt_error_t
+gras_socket_server(unsigned short port,
+ /* OUT */ gras_socket_t *dst) {
+ return gras_socket_server_ext(port,32,0,dst);
+}
+
+/**
+ * gras_socket_client:
+ *
+ * Opens a client socket to a remote host.
+ * In real life, you'll get a TCP socket.
+ */
+xbt_error_t
+gras_socket_client(const char *host,
+ unsigned short port,
+ /* OUT */ gras_socket_t *dst) {
+ return gras_socket_client_ext(host,port,32,0,dst);
+}
+
+
+void gras_socket_close(gras_socket_t sock) {
+ xbt_dynar_t sockets = gras_socketset_get();
+ gras_socket_t sock_iter;
int cursor;
/* FIXME: Issue an event when the socket is closed */
- if (sock && *sock) {
- gras_dynar_foreach(_gras_trp_sockets,cursor,sock_iter) {
- if (*sock == sock_iter) {
- gras_dynar_cursor_rm(_gras_trp_sockets,&cursor);
- if ( (*sock)->plugin->socket_close)
- (* (*sock)->plugin->socket_close)(*sock);
+ if (sock) {
+ xbt_dynar_foreach(sockets,cursor,sock_iter) {
+ if (sock == sock_iter) {
+ xbt_dynar_cursor_rm(sockets,&cursor);
+ if ( sock->plugin->socket_close)
+ (* sock->plugin->socket_close)(sock);
/* free the memory */
- free(*sock);
- *sock=NULL;
+ if (sock->peer_name)
+ xbt_free(sock->peer_name);
+ xbt_free(sock);
return;
}
}
*
* Send a bunch of bytes from on socket
*/
-gras_error_t
-gras_trp_chunk_send(gras_socket_t *sd,
+xbt_error_t
+gras_trp_chunk_send(gras_socket_t sd,
char *data,
- size_t size) {
- gras_assert1(sd->outgoing,
+ long int size) {
+ xbt_assert1(sd->outgoing,
"Socket not suited for data send (outgoing=%c)",
sd->outgoing?'y':'n');
- gras_assert1(sd->plugin->chunk_send,
+ xbt_assert1(sd->plugin->chunk_send,
"No function chunk_send on transport plugin %s",
sd->plugin->name);
return (*sd->plugin->chunk_send)(sd,data,size);
*
* Receive a bunch of bytes from a socket
*/
-gras_error_t
-gras_trp_chunk_recv(gras_socket_t *sd,
+xbt_error_t
+gras_trp_chunk_recv(gras_socket_t sd,
char *data,
- size_t size) {
- gras_assert0(sd->incoming,
+ long int size) {
+ xbt_assert0(sd->incoming,
"Socket not suited for data receive");
- gras_assert1(sd->plugin->chunk_recv,
+ xbt_assert1(sd->plugin->chunk_recv,
"No function chunk_recv on transport plugin %s",
sd->plugin->name);
return (sd->plugin->chunk_recv)(sd,data,size);
}
+/**
+ * gras_trp_flush:
+ *
+ * Make sure all pending communications are done
+ */
+xbt_error_t
+gras_trp_flush(gras_socket_t sd) {
+ return (sd->plugin->flush)(sd);
+}
-gras_error_t
+xbt_error_t
gras_trp_plugin_get_by_name(const char *name,
gras_trp_plugin_t **dst){
- return gras_dict_get(_gras_trp_plugins,name,(void**)dst);
+ return xbt_dict_get(_gras_trp_plugins,name,(void**)dst);
}
-int gras_socket_my_port (gras_socket_t *sock) {
+int gras_socket_my_port (gras_socket_t sock) {
return sock->port;
}
-int gras_socket_peer_port(gras_socket_t *sock) {
+int gras_socket_peer_port(gras_socket_t sock) {
return sock->peer_port;
}
-char *gras_socket_peer_name(gras_socket_t *sock) {
+char *gras_socket_peer_name(gras_socket_t sock) {
return sock->peer_name;
}
+
+xbt_error_t gras_socket_raw_send(gras_socket_t peer,
+ unsigned int timeout,
+ unsigned long int exp_size,
+ unsigned long int msg_size) {
+ xbt_error_t errcode;
+ char *chunk = xbt_malloc(msg_size);
+ int exp_sofar;
+
+ xbt_assert0(peer->raw,"Asked to send raw data on a regular socket");
+ for (exp_sofar=0; exp_sofar < exp_size; exp_sofar += msg_size) {
+ CDEBUG5(raw_trp,"Sent %d of %lu (msg_size=%ld) to %s:%d",
+ exp_sofar,exp_size,msg_size,
+ gras_socket_peer_name(peer), gras_socket_peer_port(peer));
+ TRY(gras_trp_chunk_send(peer,chunk,msg_size));
+ }
+ CDEBUG5(raw_trp,"Sent %d of %lu (msg_size=%ld) to %s:%d",
+ exp_sofar,exp_size,msg_size,
+ gras_socket_peer_name(peer), gras_socket_peer_port(peer));
+
+ xbt_free(chunk);
+ return no_error;/* gras_socket_raw_exchange(peer,1,timeout,expSize,msgSize); */
+}
+
+xbt_error_t gras_socket_raw_recv(gras_socket_t peer,
+ unsigned int timeout,
+ unsigned long int exp_size,
+ unsigned long int msg_size){
+
+ xbt_error_t errcode;
+ char *chunk = xbt_malloc(msg_size);
+ int exp_sofar;
+
+ xbt_assert0(peer->raw,"Asked to recveive raw data on a regular socket\n");
+ for (exp_sofar=0; exp_sofar < exp_size; exp_sofar += msg_size) {
+ CDEBUG5(raw_trp,"Recvd %d of %lu (msg_size=%ld) from %s:%d",
+ exp_sofar,exp_size,msg_size,
+ gras_socket_peer_name(peer), gras_socket_peer_port(peer));
+ TRY(gras_trp_chunk_recv(peer,chunk,msg_size));
+ }
+ CDEBUG5(raw_trp,"Recvd %d of %lu (msg_size=%ld) from %s:%d",
+ exp_sofar,exp_size,msg_size,
+ gras_socket_peer_name(peer), gras_socket_peer_port(peer));
+
+ xbt_free(chunk);
+ return no_error;/* gras_socket_raw_exchange(peer,0,timeout,expSize,msgSize); */
+}
