X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f06828c0b578173e3e8db71a29ec5084a82757d..5a75c2ad2b79132f8bef85bb8dd8643706e7ed8d:/src/gras/Transport/transport.c diff --git a/src/gras/Transport/transport.c b/src/gras/Transport/transport.c index 15874f4d9d..19ac9c5668 100644 --- a/src/gras/Transport/transport.c +++ b/src/gras/Transport/transport.c @@ -9,39 +9,67 @@ under the terms of the license (GNU LGPL) which comes with this package. */ #include /* time() */ -//#include #include "Transport/transport_private.h" - GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(transport,GRAS); static gras_dict_t *_gras_trp_plugins; /* All registered plugins */ static void gras_trp_plugin_free(void *p); /* free one of the plugins */ - -gras_dynar_t *_gras_trp_sockets; /* all existing sockets */ static void gras_trp_socket_free(void *s); /* free one socket */ -static fd_set FDread; +gras_error_t +gras_trp_plugin_new(const char *name, gras_trp_setup_t setup); -gras_error_t -gras_trp_init(void){ +gras_error_t +gras_trp_plugin_new(const char *name, gras_trp_setup_t setup) { gras_error_t errcode; - gras_trp_plugin_t *plug; + + gras_trp_plugin_t *plug = malloc(sizeof(gras_trp_plugin_t)); - /* make room for all socket ownership descriptions */ - TRY(gras_dynar_new(&_gras_trp_sockets, sizeof(gras_socket_t*), NULL)); + DEBUG1("Create plugin %s",name); + + if (!plug) + RAISE_MALLOC; + + memset(plug,0,sizeof(gras_trp_plugin_t)); + + plug->name=strdup(name); + if (!plug->name) + RAISE_MALLOC; + + errcode = setup(plug); + switch (errcode) { + case mismatch_error: + /* SG plugin return mismatch when in RL mode (and vice versa) */ + free(plug->name); + free(plug); + break; + + case no_error: + TRY(gras_dict_set(_gras_trp_plugins, + name, plug, gras_trp_plugin_free)); + break; + + default: + free(plug); + return errcode; + } + return no_error; +} - /* We do not ear for any socket for now */ - FD_ZERO(&FDread); +gras_error_t +gras_trp_init(void){ + gras_error_t errcode; /* make room for all plugins */ TRY(gras_dict_new(&_gras_trp_plugins)); - /* TCP */ - TRY(gras_trp_tcp_init(&plug)); - TRY(gras_dict_insert(_gras_trp_plugins,plug->name, plug, gras_trp_plugin_free)); + /* Add them */ + TRY(gras_trp_plugin_new("tcp", gras_trp_tcp_setup)); + TRY(gras_trp_plugin_new("file",gras_trp_file_setup)); + TRY(gras_trp_plugin_new("sg",gras_trp_sg_setup)); return no_error; } @@ -49,7 +77,6 @@ gras_trp_init(void){ void gras_trp_exit(void){ gras_dict_free(&_gras_trp_plugins); - gras_dynar_free(_gras_trp_sockets); } @@ -57,32 +84,160 @@ void gras_trp_plugin_free(void *p) { 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); + free(plug->data); + } free(plug->name); free(plug); } } + +/** + * gras_trp_socket_new: + * + * Malloc a new socket, and initialize it with defaults + */ +gras_error_t gras_trp_socket_new(int incoming, + gras_socket_t **dst) { + + gras_socket_t *sock; + + if (! (sock=malloc(sizeof(gras_socket_t))) ) + RAISE_MALLOC; + DEBUG1("Create a new socket (%p)", sock); + + sock->plugin = NULL; + sock->sd = -1; + + 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 gras_dynar_push(gras_socketset_get(),dst); +} + + +/** + * gras_socket_server: + * + * 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) { + + gras_error_t errcode; + gras_trp_plugin_t *trp; + gras_socket_t *sock; + + *dst = NULL; + + DEBUG1("Create a server socket from plugin %s",gras_if_RL() ? "tcp" : "sg"); + TRY(gras_trp_plugin_get_by_name(gras_if_RL() ? "tcp" : "sg", + &trp)); + + /* defaults settings */ + TRY(gras_trp_socket_new(1,&sock)); + sock->plugin= trp; + sock->port=port; + + /* Call plugin socket creation function */ + errcode = trp->socket_server(trp, port, 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); + return errcode; + } + + *dst = sock; + + return no_error; +} + +/** + * gras_socket_client: + * + * 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) { + + gras_error_t errcode; + gras_trp_plugin_t *trp; + gras_socket_t *sock; + + *dst = NULL; + + TRY(gras_trp_plugin_get_by_name(gras_if_RL() ? "tcp" : "sg", + &trp)); + + DEBUG1("Create a client socket from plugin %s",gras_if_RL() ? "tcp" : "sg"); + /* defaults settings */ + TRY(gras_trp_socket_new(0,&sock)); + sock->plugin= trp; + sock->peer_port = port; + sock->peer_name = strdup(host?host:"localhost"); + + /* plugin-specific */ + errcode= (* trp->socket_client)(trp, + host ? host : "localhost", port, + 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); + return errcode; + } + + *dst = sock; + + return no_error; +} + void gras_socket_close(gras_socket_t *sock) { + gras_dynar_t *sockets = gras_socketset_get(); gras_socket_t *sock_iter; int cursor; /* FIXME: Issue an event when the socket is closed */ if (sock) { - gras_dynar_foreach(_gras_trp_sockets,cursor,sock_iter) { + gras_dynar_foreach(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); + gras_dynar_cursor_rm(sockets,&cursor); + if ( sock->plugin->socket_close) + (* sock->plugin->socket_close)(sock); /* free the memory */ + if (sock->peer_name) + free(sock->peer_name); free(sock); return; } } - WARNING0("Ignoring request to free an unknown socket"); + WARN0("Ignoring request to free an unknown socket"); } } @@ -95,6 +250,12 @@ gras_error_t gras_trp_chunk_send(gras_socket_t *sd, char *data, size_t size) { + gras_assert1(sd->outgoing, + "Socket not suited for data send (outgoing=%c)", + sd->outgoing?'y':'n'); + gras_assert1(sd->plugin->chunk_send, + "No function chunk_send on transport plugin %s", + sd->plugin->name); return (*sd->plugin->chunk_send)(sd,data,size); } /** @@ -102,10 +263,16 @@ gras_trp_chunk_send(gras_socket_t *sd, * * Receive a bunch of bytes from a socket */ -gras_error_t gras_trp_chunk_recv(gras_socket_t *sd, - char *data, - size_t size) { - return (*sd->plugin->chunk_recv)(sd,data,size); +gras_error_t +gras_trp_chunk_recv(gras_socket_t *sd, + char *data, + size_t size) { + gras_assert0(sd->incoming, + "Socket not suited for data receive"); + gras_assert1(sd->plugin->chunk_recv, + "No function chunk_recv on transport plugin %s", + sd->plugin->name); + return (sd->plugin->chunk_recv)(sd,data,size); } @@ -113,6 +280,15 @@ gras_error_t gras_trp_plugin_get_by_name(const char *name, gras_trp_plugin_t **dst){ - return gras_dict_retrieve(_gras_trp_plugins,name,(void**)dst); + return gras_dict_get(_gras_trp_plugins,name,(void**)dst); } +int gras_socket_my_port (gras_socket_t *sock) { + return sock->port; +} +int gras_socket_peer_port(gras_socket_t *sock) { + return sock->peer_port; +} +char *gras_socket_peer_name(gras_socket_t *sock) { + return sock->peer_name; +}