From f107c626f71c9a6a1d52aad57344abd7331ed62e Mon Sep 17 00:00:00 2001 From: mquinson Date: Thu, 20 Oct 2005 17:14:45 +0000 Subject: [PATCH] Eradicate the last bits of the buffered transport which used to live on top of either TCP or SG and was merged with TCP once SG used datadesc_cpy git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1768 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/gras/Transport/sg_transport.c | 1 - src/gras/Transport/transport.c | 6 ++---- src/gras/Transport/transport_plugin_tcp.c | 4 ++-- src/gras/Transport/transport_private.h | 1 - 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/gras/Transport/sg_transport.c b/src/gras/Transport/sg_transport.c index 9990a7e3e2..b4a6935bc0 100644 --- a/src/gras/Transport/sg_transport.c +++ b/src/gras/Transport/sg_transport.c @@ -138,7 +138,6 @@ gras_socket_t gras_trp_select(double timeout) { void gras_trp_tcp_setup(gras_trp_plugin_t plug) { THROW0(mismatch_error,0,NULL); } void gras_trp_file_setup(gras_trp_plugin_t plug){ THROW0(mismatch_error,0,NULL); } -void gras_trp_buf_setup(gras_trp_plugin_t plug) { THROW0(mismatch_error,0,NULL); } void gras_trp_iov_setup(gras_trp_plugin_t plug) { THROW0(mismatch_error,0,NULL); } gras_socket_t gras_trp_buf_init_sock(gras_socket_t sock) { return sock;} diff --git a/src/gras/Transport/transport.c b/src/gras/Transport/transport.c index 6b5530f8ad..3545c213b8 100644 --- a/src/gras/Transport/transport.c +++ b/src/gras/Transport/transport.c @@ -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++; @@ -351,7 +349,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) { diff --git a/src/gras/Transport/transport_plugin_tcp.c b/src/gras/Transport/transport_plugin_tcp.c index ca4b880549..06609af3a9 100644 --- a/src/gras/Transport/transport_plugin_tcp.c +++ b/src/gras/Transport/transport_plugin_tcp.c @@ -1,6 +1,6 @@ /* $Id$ */ -/* buf trp (transport) - buffered transport using the TCP one */ +/* buf trp (transport) - buffered transport using the TCP one */ /* Copyright (c) 2004 Martin Quinson. All rights reserved. */ @@ -564,7 +564,7 @@ gras_socket_t gras_trp_buf_init_sock(gras_socket_t sock) { *** Code ***/ void -gras_trp_buf_setup(gras_trp_plugin_t plug) { +gras_trp_tcp_setup(gras_trp_plugin_t plug) { plug->socket_client = gras_trp_buf_socket_client; plug->socket_server = gras_trp_buf_socket_server; diff --git a/src/gras/Transport/transport_private.h b/src/gras/Transport/transport_private.h index 9af4bed4cd..ccf3bd9514 100644 --- a/src/gras/Transport/transport_private.h +++ b/src/gras/Transport/transport_private.h @@ -64,7 +64,6 @@ void gras_trp_tcp_setup(gras_trp_plugin_t plug); void gras_trp_iov_setup(gras_trp_plugin_t plug); void gras_trp_file_setup(gras_trp_plugin_t plug); void gras_trp_sg_setup(gras_trp_plugin_t plug); -void gras_trp_buf_setup(gras_trp_plugin_t plug); /* -- 2.20.1