X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/87468a9f6b682ee41edc3a16a100554ef48032c9..2e2ca643ddfa22db6d912fe297d319433217a401:/src/gras/Transport/transport.c diff --git a/src/gras/Transport/transport.c b/src/gras/Transport/transport.c index 4b2e1befa1..9d66b21e8c 100644 --- a/src/gras/Transport/transport.c +++ b/src/gras/Transport/transport.c @@ -36,7 +36,7 @@ gras_trp_plugin_new(const char *name, gras_trp_setup_t setup) { free(plug->name); free(plug); plug=NULL; - xbt_ex_free(e); + xbt_ex_free(&e); } else { RETHROW; } @@ -83,9 +83,7 @@ void gras_trp_init(void){ /* Add plugins */ gras_trp_plugin_new("file",gras_trp_file_setup); gras_trp_plugin_new("sg",gras_trp_sg_setup); - - /* buf is composed, so it must come after the others */ - gras_trp_plugin_new("buf", gras_trp_buf_setup); + gras_trp_plugin_new("tcp", gras_trp_tcp_setup); } _gras_trp_started++; @@ -93,7 +91,7 @@ void gras_trp_init(void){ void gras_trp_exit(void){ - xbt_dynar_t sockets = gras_socketset_get(); + xbt_dynar_t sockets = ((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->sockets; gras_socket_t sock_iter; int cursor; @@ -170,21 +168,24 @@ void gras_trp_socket_new(int incoming, *dst = sock; - xbt_dynar_push(gras_socketset_get(),dst); + xbt_dynar_push(((gras_trp_procdata_t) + gras_libdata_by_id(gras_trp_libdata_id))->sockets,dst); XBT_OUT; } /** - * 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. + * @brief Opens a server socket and makes it ready to be listened to. + * @param port: port on which you want to listen + * @param buf_size: size of the buffer (in byte) on the socket (for TCP sockets only). If 0, a sain default is used (32k, but may change) + * @param measurement: whether this socket is meant to convey measurement (if you don't know, use 0 to exchange regular messages) + * + * In real life, you'll get a TCP socket. */ gras_socket_t gras_socket_server_ext(unsigned short port, - unsigned long int bufSize, + unsigned long int buf_size, int measurement) { xbt_ex_t e; @@ -194,13 +195,13 @@ gras_socket_server_ext(unsigned short port, DEBUG2("Create a server socket from plugin %s on port %d", gras_if_RL() ? "tcp" : "sg", port); - trp = gras_trp_plugin_get_by_name(gras_if_SG() ? "sg":(measurement?"tcp":"buf")); + trp = gras_trp_plugin_get_by_name(gras_if_SG() ? "sg":"tcp"); /* defaults settings */ gras_trp_socket_new(1,&sock); sock->plugin= trp; sock->port=port; - sock->bufSize = bufSize; + sock->buf_size = buf_size>0 ? buf_size : 32*1024; sock->meas = measurement; /* Call plugin socket creation function */ @@ -220,23 +221,26 @@ gras_socket_server_ext(unsigned short port, } /** - * gras_socket_client_ext: - * - * Opens a client socket to a remote host. - * In real life, you'll get a TCP socket. + * @brief Opens a client socket to a remote host. + * @param host: who you want to connect to + * @param port: where you want to connect to on this host + * @param buf_size: size of the buffer (in bytes) on the socket (for TCP sockets only). If 0, a sain default is used (32k, but may change) + * @param measurement: whether this socket is meant to convey measurement (if you don't know, use 0 to exchange regular messages) + * + * In real life, you'll get a TCP socket. */ gras_socket_t gras_socket_client_ext(const char *host, unsigned short port, - unsigned long int bufSize, + unsigned long int buf_size, int measurement) { xbt_ex_t e; gras_trp_plugin_t trp; gras_socket_t sock; - trp = gras_trp_plugin_get_by_name(gras_if_SG() ? "sg":(measurement?"tcp":"buf")); + trp = gras_trp_plugin_get_by_name(gras_if_SG() ? "sg":"tcp"); DEBUG1("Create a client socket from plugin %s",gras_if_RL() ? "tcp" : "sg"); /* defaults settings */ @@ -244,7 +248,7 @@ gras_socket_client_ext(const char *host, sock->plugin= trp; sock->peer_port = port; sock->peer_name = (char*)strdup(host?host:"localhost"); - sock->bufSize = bufSize; + sock->buf_size = buf_size>0 ? buf_size: 32*1024; sock->meas = measurement; /* plugin-specific */ @@ -287,7 +291,7 @@ gras_socket_client(const char *host, void gras_socket_close(gras_socket_t sock) { - xbt_dynar_t sockets = gras_socketset_get(); + xbt_dynar_t sockets = ((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->sockets; gras_socket_t sock_iter; int cursor; @@ -351,7 +355,7 @@ gras_trp_plugin_get_by_name(const char *name){ return xbt_dict_get(_gras_trp_plugins,name); } -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) { @@ -384,13 +388,16 @@ void gras_socket_meas_send(gras_socket_t peer, unsigned int timeout, unsigned long int exp_size, unsigned long int msg_size) { - char *chunk = xbt_malloc0(msg_size); + char *chunk=NULL; unsigned long int exp_sofar; XBT_IN; + if (gras_if_RL()) + chunk=xbt_malloc0(msg_size); + xbt_assert0(peer->meas,"Asked to send measurement data on a regular socket"); - xbt_assert0(peer->outgoing,"Socket not suited for data send"); + xbt_assert0(peer->outgoing,"Socket not suited for data send (was created with gras_socket_server(), not gras_socket_client())"); for (exp_sofar=0; exp_sofar < exp_size; exp_sofar += msg_size) { CDEBUG5(trp_meas,"Sent %lu of %lu (msg_size=%ld) to %s:%d", @@ -402,7 +409,8 @@ void gras_socket_meas_send(gras_socket_t peer, exp_sofar,exp_size,msg_size, gras_socket_peer_name(peer), gras_socket_peer_port(peer)); - free(chunk); + if (gras_if_RL()) + free(chunk); XBT_OUT; } @@ -417,11 +425,14 @@ void gras_socket_meas_recv(gras_socket_t peer, unsigned long int exp_size, unsigned long int msg_size){ - char *chunk = xbt_malloc(msg_size); + char *chunk=NULL; unsigned long int exp_sofar; XBT_IN; + if (gras_if_RL()) + chunk = xbt_malloc(msg_size); + xbt_assert0(peer->meas, "Asked to receive measurement data on a regular socket"); xbt_assert0(peer->incoming,"Socket not suited for data receive"); @@ -436,7 +447,8 @@ void gras_socket_meas_recv(gras_socket_t peer, exp_sofar,exp_size,msg_size, gras_socket_peer_name(peer), gras_socket_peer_port(peer)); - free(chunk); + if (gras_if_RL()) + free(chunk); XBT_OUT; } @@ -459,7 +471,8 @@ gras_socket_t gras_socket_meas_accept(gras_socket_t peer){ "No need to accept on non-measurement sockets (it's automatic)"); if (!peer->accepting) { - /* nothing to accept here */ + /* nothing to accept here (must be in SG) */ + /* FIXME: this is BAD! since it makes tricky to free the accepted socket*/ return peer; } @@ -477,6 +490,8 @@ gras_socket_t gras_socket_meas_accept(gras_socket_t peer){ static void *gras_trp_procdata_new() { gras_trp_procdata_t res = xbt_new(s_gras_trp_procdata_t,1); + res->name = xbt_strdup("gras_trp"); + res->name_len = 0; res->sockets = xbt_dynar_new(sizeof(gras_socket_t*), NULL); return (void*)res; @@ -489,19 +504,15 @@ static void gras_trp_procdata_free(void *data) { gras_trp_procdata_t res = (gras_trp_procdata_t)data; xbt_dynar_free(&( res->sockets )); + free(res->name); free(res); } /* * Module registration */ +int gras_trp_libdata_id; void gras_trp_register() { - gras_procdata_add("gras_trp",gras_trp_procdata_new, gras_trp_procdata_free); + gras_trp_libdata_id = gras_procdata_add("gras_trp",gras_trp_procdata_new, gras_trp_procdata_free); } - -xbt_dynar_t -gras_socketset_get(void) { - /* FIXME: KILLME */ - return ((gras_trp_procdata_t) gras_libdata_get("gras_trp"))->sockets; -}