X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1bbfe6dff09cff639aaab8fd2898678a5a630c2b..e6a8d8720982ba6b6e58c71ee002eab1b222e6ca:/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 bb3a4c345d..9ad44a7dad 100644 --- a/src/gras/Transport/transport_plugin_file.c +++ b/src/gras/Transport/transport_plugin_file.c @@ -2,40 +2,34 @@ /* 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 "portable.h" +#include "gras/Transport/transport_private.h" +#include "xbt/ex.h" -#include "gras_private.h" -#include "transport_private.h" - -GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(trp_file,transport); - -typedef struct { - int buffsize; -} gras_trp_tcp_sock_specific_t; +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_trp_file,gras_trp, + "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); - -gras_error_t gras_trp_file_chunk_recv(gras_socket_t *sd, - char *data, - size_t size); - -void gras_trp_file_free_specific(void *s); +void gras_trp_file_chunk_send_raw(gras_socket_t sd, + const char *data, + unsigned long int size); +void gras_trp_file_chunk_send(gras_socket_t sd, + const char *data, + unsigned long int size, + int stable_ignored); + +int gras_trp_file_chunk_recv(gras_socket_t sd, + char *data, + unsigned long int size); /*** *** Specific plugin part @@ -43,45 +37,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) { +void +gras_trp_file_setup(gras_trp_plugin_t plug) { - 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; + gras_trp_file_plug_data_t *file = xbt_new(gras_trp_file_plug_data_t,1); - FD_ZERO(&(specif->incoming_socks)); + FD_ZERO(&(file->incoming_socks)); - res->name = strdup("file"); - res->socket_client = NULL; - res->socket_server = NULL; - res->socket_accept = NULL; - res->socket_close = gras_trp_file_close; + plug->socket_close = gras_trp_file_close; - res->chunk_send = gras_trp_file_chunk_send; - res->chunk_recv = gras_trp_file_chunk_recv; + plug->raw_send = gras_trp_file_chunk_send_raw; + plug->send = gras_trp_file_chunk_send; - res->specific = (void*)specif; - res->free_specific = gras_trp_file_free_specific; + plug->raw_recv = plug->recv = gras_trp_file_chunk_recv; - *dst = res; - return no_error; -} - -void gras_trp_file_free_specific(void *s) { - gras_trp_file_specific_t *specific = s; - free(specific); + plug->data = (void*)file; } /** @@ -91,47 +72,39 @@ void gras_trp_file_free_specific(void *s) { * * This only possible in RL, and is mainly for debugging. */ -gras_error_t -gras_socket_client_from_file(const char*path, - /* OUT */ gras_socket_t **dst) { - gras_error_t errcode; - gras_trp_plugin_t *trp; +gras_socket_t +gras_socket_client_from_file(const char*path) { + gras_socket_t res; - 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,&res); - TRY(gras_trp_plugin_get_by_name("file",&trp)); - (*dst)->plugin=trp; + res->plugin=gras_trp_plugin_get_by_name("file"); if (strcmp("-", path)) { - (*dst)->sd = open(path, O_WRONLY|O_CREAT, S_IRUSR|S_IWUSR|S_IRGRP ); + res->sd = open(path, O_WRONLY|O_CREAT | O_BINARY, S_IRUSR|S_IWUSR|S_IRGRP ); - if ( (*dst)->sd < 0) { - RAISE2(system_error, + if ( res->sd < 0) { + THROW2(system_error,0, "Cannot create a client socket from file %s: %s", path, strerror(errno)); } } else { - (*dst)->sd = 1; /* stdout */ + res->sd = 1; /* stdout */ } 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'); - /* register socket */ - errcode = gras_dynar_push(_gras_trp_sockets,dst); - if (errcode != no_error) { - free(*dst); - *dst = NULL; - return errcode; - } - - return no_error; + res->sd, + res->incoming?'y':'n', + res->outgoing?'y':'n', + res->accepting?'y':'n'); + + xbt_dynar_push(((gras_trp_procdata_t) + gras_libdata_by_id(gras_trp_libdata_id))->sockets,&res); + return res; } /** @@ -141,55 +114,45 @@ gras_socket_client_from_file(const char*path, * * This only possible in RL, and is mainly for debugging. */ -gras_error_t -gras_socket_server_from_file(const char*path, - /* OUT */ gras_socket_t **dst) { - gras_error_t errcode; - gras_trp_plugin_t *trp; +gras_socket_t gras_socket_server_from_file(const char*path) { + gras_socket_t res; - 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,&res); - TRY(gras_trp_plugin_get_by_name("file",&trp)); - (*dst)->plugin=trp; + res->plugin=gras_trp_plugin_get_by_name("file"); if (strcmp("-", path)) { - (*dst)->sd = open(path, O_RDONLY ); + res->sd = open(path, O_RDONLY | O_BINARY); - if ( (*dst)->sd < 0) { - RAISE2(system_error, + if ( res->sd < 0) { + THROW2(system_error,0, "Cannot create a server socket from file %s: %s", path, strerror(errno)); } } else { - (*dst)->sd = 0; /* stdin */ + res->sd = 0; /* stdin */ } 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; - } - - return no_error; + res->sd, + res->incoming?'y':'n', + res->outgoing?'y':'n', + res->accepting?'y':'n'); + + xbt_dynar_push(((gras_trp_procdata_t) + gras_libdata_by_id(gras_trp_libdata_id))->sockets,&res); + return res; } -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"); @@ -199,11 +162,11 @@ void gras_trp_file_close(gras_socket_t *sock){ 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", + WARN2("error while closing file %d: %s", sock->sd, strerror(errno)); } } @@ -214,21 +177,29 @@ 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) { +void +gras_trp_file_chunk_send(gras_socket_t sock, + const char *data, + unsigned long int size, + int stable_ignored) { + gras_trp_file_chunk_send_raw(sock,data,size); +} +void +gras_trp_file_chunk_send_raw(gras_socket_t sock, + const char *data, + unsigned 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; - DEBUG3("write(%d, %p, %ld);", sock->sd, data, (size_t)size); - status = write(sock->sd, data, (size_t)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", + THROW4(system_error,0,"write(%d,%p,%d) failed: %s", sock->sd, data, (int)size, strerror(errno)); } @@ -237,46 +208,52 @@ gras_trp_file_chunk_send(gras_socket_t *sock, size -= status; data += status; } else { - RAISE0(system_error,"file descriptor closed"); + THROW0(system_error,0,"file descriptor closed"); } } - - return no_error; } /** * gras_trp_file_chunk_recv: * * Receive data on a file pseudo-socket. */ -gras_error_t -gras_trp_file_chunk_recv(gras_socket_t *sock, - char *data, - size_t 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"); - +int +gras_trp_file_chunk_recv(gras_socket_t sock, + char *data, + unsigned long int size) { + + int got = 0; + + 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"); + + if (sock->recvd) { + data[0] = sock->recvd_val; + sock->recvd = 0; + got++; + size--; + } + while (size) { int status = 0; - status = read(sock->sd, data, (size_t)size); - DEBUG3("read(%d, %p, %ld);", sock->sd, data, size); + status = read(sock->sd, data+got, (long int)size); + DEBUG3("read(%d, %p, %ld);", sock->sd, data+got, size); - if (status == -1) { - RAISE4(system_error,"read(%d,%p,%d) failed: %s", - sock->sd, data, (int)size, + if (status < 0) { + THROW4(system_error,0,"read(%d,%p,%d) failed: %s", + sock->sd, data+got, (int)size, strerror(errno)); } if (status) { - size -= status; - data += status; + size -= status; + got += status; } else { - RAISE0(system_error,"file descriptor closed"); + THROW1(system_error,errno,"file descriptor closed after %d bytes",got); } } - - return no_error; + return got; }