X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4c6db1aa9224333591395fbe6404013a0a08503a..57dce314090a845874cb9e3f24e9bcadc1bacaf9:/src/gras/Transport/transport.c diff --git a/src/gras/Transport/transport.c b/src/gras/Transport/transport.c index 86d1ef2e92..13b466e271 100644 --- a/src/gras/Transport/transport.c +++ b/src/gras/Transport/transport.c @@ -17,12 +17,8 @@ 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); @@ -31,6 +27,9 @@ gras_trp_plugin_new(const char *name, gras_trp_setup_t setup) { gras_error_t errcode; gras_trp_plugin_t *plug = malloc(sizeof(gras_trp_plugin_t)); + + DEBUG1("Create plugin %s",name); + if (!plug) RAISE_MALLOC; @@ -40,10 +39,23 @@ gras_trp_plugin_new(const char *name, gras_trp_setup_t setup) { if (!plug->name) RAISE_MALLOC; - TRY(setup(plug)); - TRY(gras_dict_set(_gras_trp_plugins, - plug->name, plug, gras_trp_plugin_free)); + 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; } @@ -51,12 +63,6 @@ gras_error_t gras_trp_init(void){ gras_error_t errcode; - /* make room for all socket ownership descriptions */ - TRY(gras_dynar_new(&_gras_trp_sockets, sizeof(gras_socket_t*), NULL)); - - /* We do not ear for any socket for now */ - FD_ZERO(&FDread); - /* make room for all plugins */ TRY(gras_dict_new(&_gras_trp_plugins)); @@ -71,7 +77,6 @@ gras_trp_init(void){ void gras_trp_exit(void){ gras_dict_free(&_gras_trp_plugins); - gras_dynar_free(_gras_trp_sockets); } @@ -79,10 +84,12 @@ void gras_trp_plugin_free(void *p) { gras_trp_plugin_t *plug = p; if (plug) { - if (plug->exit) + if (plug->exit) { plug->exit(plug); - else if (plug->data) + } else if (plug->data) { + DEBUG1("Plugin %s lacks exit(). Free data anyway.",plug->name); free(plug->data); + } free(plug->name); free(plug); @@ -102,17 +109,15 @@ gras_error_t gras_trp_socket_new(int incoming, if (! (sock=malloc(sizeof(gras_socket_t))) ) RAISE_MALLOC; + DEBUG1("Create a new socket (%p)", 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; @@ -120,7 +125,8 @@ gras_error_t gras_trp_socket_new(int incoming, sock->raw = 0; *dst = sock; - return no_error; + + return gras_dynar_push(gras_socketset_get(),dst); } @@ -140,7 +146,8 @@ gras_socket_server(unsigned short port, *dst = NULL; - TRY(gras_trp_plugin_get_by_name(gras_if_RL() ? "TCP" : "SG", + 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 */ @@ -150,19 +157,17 @@ gras_socket_server(unsigned short 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; - /* Register this socket */ - errcode = gras_dynar_push(_gras_trp_sockets,dst); - if (errcode != no_error) { - free(sock); - *dst = NULL; - return errcode; - } return no_error; } @@ -184,9 +189,10 @@ gras_socket_client(const char *host, *dst = NULL; - TRY(gras_trp_plugin_get_by_name(gras_if_RL() ? "TCP" : "SG", + 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; @@ -197,38 +203,38 @@ gras_socket_client(const char *host, 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; } - /* 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) { +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 && *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) { + gras_dynar_foreach(sockets,cursor,sock_iter) { + if (sock == sock_iter) { + gras_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) + free(sock->peer_name); + free(sock); return; } } @@ -244,7 +250,7 @@ void gras_socket_close(gras_socket_t **sock) { gras_error_t gras_trp_chunk_send(gras_socket_t *sd, char *data, - size_t size) { + long int size) { gras_assert1(sd->outgoing, "Socket not suited for data send (outgoing=%c)", sd->outgoing?'y':'n'); @@ -261,7 +267,7 @@ gras_trp_chunk_send(gras_socket_t *sd, gras_error_t gras_trp_chunk_recv(gras_socket_t *sd, char *data, - size_t size) { + long int size) { gras_assert0(sd->incoming, "Socket not suited for data receive"); gras_assert1(sd->plugin->chunk_recv,