X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6511b78ff810ead55a110d42b01a08255a55b56d..78492f2b2d3a263a55beea7aa2a1fd00c0743524:/src/gras/Transport/transport_plugin_file.c diff --git a/src/gras/Transport/transport_plugin_file.c b/src/gras/Transport/transport_plugin_file.c index 74774ae244..a4bb75915e 100644 --- a/src/gras/Transport/transport_plugin_file.c +++ b/src/gras/Transport/transport_plugin_file.c @@ -2,40 +2,39 @@ /* File transport - send/receive a bunch of bytes from a file */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2004 Martin Quinson. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* 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. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ -#include -#include -#include -#include - -#include "gras_private.h" +#include "portable.h" #include "transport_private.h" -GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(trp_file,transport); +#if 0 +# include +# include +# include +# include +# include +# include +#endif -typedef struct { - int buffsize; -} gras_trp_tcp_sock_specific_t; +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(trp_file,transport, + "Pseudo-transport to write to/read from a file"); /*** *** Prototypes ***/ -void gras_trp_file_close(gras_socket_t *sd); +void gras_trp_file_close(gras_socket_t sd); -gras_error_t gras_trp_file_chunk_send(gras_socket_t *sd, - char *data, - size_t size); +xbt_error_t gras_trp_file_chunk_send(gras_socket_t sd, + const char *data, + long int size); -gras_error_t gras_trp_file_chunk_recv(gras_socket_t *sd, +xbt_error_t gras_trp_file_chunk_recv(gras_socket_t sd, char *data, - size_t size); + long int size); -void gras_trp_file_free_specific(void *s); /*** *** Specific plugin part @@ -43,47 +42,32 @@ void gras_trp_file_free_specific(void *s); typedef struct { fd_set incoming_socks; -} gras_trp_file_specific_t; +} gras_trp_file_plug_data_t; /*** *** Specific socket part ***/ + /*** *** Code ***/ -gras_error_t -gras_trp_file_init(gras_trp_plugin_t **dst) { - - gras_trp_plugin_t *res=malloc(sizeof(gras_trp_plugin_t)); - gras_trp_file_specific_t *specif = malloc(sizeof(gras_trp_file_specific_t)); - if (!res || !specif) - RAISE_MALLOC; +xbt_error_t +gras_trp_file_setup(gras_trp_plugin_t *plug) { - FD_ZERO(&(specif->incoming_socks)); + gras_trp_file_plug_data_t *file = xbt_new(gras_trp_file_plug_data_t,1); - res->name = strdup("file"); - res->socket_client = NULL; - res->socket_server = NULL; - res->socket_accept = NULL; - res->socket_close = gras_trp_file_close; + FD_ZERO(&(file->incoming_socks)); - res->chunk_send = gras_trp_file_chunk_send; - res->chunk_recv = gras_trp_file_chunk_recv; + plug->socket_close = gras_trp_file_close; + plug->chunk_send = gras_trp_file_chunk_send; + plug->chunk_recv = gras_trp_file_chunk_recv; + plug->data = (void*)file; - res->specific = (void*)specif; - res->free_specific = gras_trp_file_free_specific; - - *dst = res; return no_error; } -void gras_trp_file_free_specific(void *s) { - gras_trp_file_specific_t *specific = s; - free(specific); -} - /** * gras_socket_client_from_file: * @@ -91,27 +75,22 @@ void gras_trp_file_free_specific(void *s) { * * This only possible in RL, and is mainly for debugging. */ -gras_error_t +xbt_error_t gras_socket_client_from_file(const char*path, - /* OUT */ gras_socket_t **dst) { - gras_error_t errcode; + /* OUT */ gras_socket_t *dst) { + xbt_error_t errcode; gras_trp_plugin_t *trp; - gras_assert0(gras_if_RL(), + xbt_assert0(gras_if_RL(), "Cannot use file as socket in the simulator"); - TRY(gras_trp_socket_new(0,dst)); + gras_trp_socket_new(0,dst); TRY(gras_trp_plugin_get_by_name("file",&trp)); (*dst)->plugin=trp; - DEBUG3("in=%c out=%c accept=%c", - (*dst)->incoming?'y':'n', - (*dst)->outgoing?'y':'n', - (*dst)->accepting?'y':'n'); - if (strcmp("-", path)) { - (*dst)->sd = open(path, O_RDONLY ); + (*dst)->sd = open(path, O_WRONLY|O_CREAT | O_BINARY, S_IRUSR|S_IWUSR|S_IRGRP ); if ( (*dst)->sd < 0) { RAISE2(system_error, @@ -122,19 +101,13 @@ gras_socket_client_from_file(const char*path, (*dst)->sd = 1; /* stdout */ } - DEBUG4("sd=%d in=%c out=%c accept=%c", - (*dst)->sd, - (*dst)->incoming?'y':'n', - (*dst)->outgoing?'y':'n', - (*dst)->accepting?'y':'n'); - /* register socket */ - errcode = gras_dynar_push(_gras_trp_sockets,dst); - if (errcode != no_error) { - free(*dst); - *dst = NULL; - return errcode; - } - + DEBUG5("sock_client_from_file(%s): sd=%d in=%c out=%c accept=%c", + path, + (*dst)->sd, + (*dst)->incoming?'y':'n', + (*dst)->outgoing?'y':'n', + (*dst)->accepting?'y':'n'); + return no_error; } @@ -145,23 +118,23 @@ gras_socket_client_from_file(const char*path, * * This only possible in RL, and is mainly for debugging. */ -gras_error_t +xbt_error_t gras_socket_server_from_file(const char*path, - /* OUT */ gras_socket_t **dst) { - gras_error_t errcode; + /* OUT */ gras_socket_t *dst) { + xbt_error_t errcode; gras_trp_plugin_t *trp; - gras_assert0(gras_if_RL(), + xbt_assert0(gras_if_RL(), "Cannot use file as socket in the simulator"); - TRY(gras_trp_socket_new(1,dst)); + gras_trp_socket_new(1,dst); TRY(gras_trp_plugin_get_by_name("file",&trp)); (*dst)->plugin=trp; if (strcmp("-", path)) { - (*dst)->sd = open(path, O_WRONLY ); + (*dst)->sd = open(path, O_RDONLY | O_BINARY); if ( (*dst)->sd < 0) { RAISE2(system_error, @@ -178,36 +151,28 @@ gras_socket_server_from_file(const char*path, (*dst)->outgoing?'y':'n', (*dst)->accepting?'y':'n'); - /* register socket */ - errcode = gras_dynar_push(_gras_trp_sockets,dst); - if (errcode != no_error) { - free(*dst); - *dst = NULL; - return errcode; - } - return no_error; } -void gras_trp_file_close(gras_socket_t *sock){ - gras_trp_file_specific_t *specific; +void gras_trp_file_close(gras_socket_t sock){ + gras_trp_file_plug_data_t *data; if (!sock) return; /* close only once */ - specific=sock->plugin->specific; + data=sock->plugin->data; if (sock->sd == 0) { DEBUG0("Do not close stdin"); } else if (sock->sd == 1) { DEBUG0("Do not close stdout"); } else { - DEBUG1("close file connection %d\n", sock->sd); + DEBUG1("close file connection %d", sock->sd); /* forget about the socket */ - FD_CLR(sock->sd, &(specific->incoming_socks)); + FD_CLR(sock->sd, &(data->incoming_socks)); /* close the socket */ if(close(sock->sd) < 0) { - WARNING2("error while closing file %d: %s\n", + WARN2("error while closing file %d: %s", sock->sd, strerror(errno)); } } @@ -218,18 +183,19 @@ void gras_trp_file_close(gras_socket_t *sock){ * * Send data on a file pseudo-socket */ -gras_error_t -gras_trp_file_chunk_send(gras_socket_t *sock, - char *data, - size_t size) { +xbt_error_t +gras_trp_file_chunk_send(gras_socket_t sock, + const char *data, + long int size) { - gras_assert0(size >= 0, "Cannot send a negative amount of data"); + xbt_assert0(sock->outgoing, "Cannot write on client file socket"); + xbt_assert0(size >= 0, "Cannot send a negative amount of data"); while (size) { int status = 0; - status = write(sock->sd, data, (size_t)size); - DEBUG3("write(%d, %p, %ld);\n", sock->sd, data, size); + DEBUG3("write(%d, %p, %ld);", sock->sd, data, (long int)size); + status = write(sock->sd, data, (long int)size); if (status == -1) { RAISE4(system_error,"write(%d,%p,%d) failed: %s", @@ -252,20 +218,20 @@ gras_trp_file_chunk_send(gras_socket_t *sock, * * Receive data on a file pseudo-socket. */ -gras_error_t -gras_trp_file_chunk_recv(gras_socket_t *sock, +xbt_error_t +gras_trp_file_chunk_recv(gras_socket_t sock, char *data, - size_t size) { + long int size) { - /* TCP sockets are in duplex mode, don't check direction */ - gras_assert0(sock, "Cannot recv on an NULL socket"); - gras_assert0(size >= 0, "Cannot receive a negative amount of data"); + xbt_assert0(sock, "Cannot recv on an NULL socket"); + xbt_assert0(sock->incoming, "Cannot recv on client file socket"); + xbt_assert0(size >= 0, "Cannot receive a negative amount of data"); while (size) { int status = 0; - status = read(sock->sd, data, (size_t)size); - DEBUG3("read(%d, %p, %ld);\n", sock->sd, data, size); + status = read(sock->sd, data, (long int)size); + DEBUG3("read(%d, %p, %ld);", sock->sd, data, size); if (status == -1) { RAISE4(system_error,"read(%d,%p,%d) failed: %s",