X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/238da78e8ed4a5788c50d0131fee97c96493c1be..f9dd9e3d692f6c43f78500a9fc66fe8663dedbbf:/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 466a67fc62..ba81c85567 100644 --- a/src/gras/Transport/transport_plugin_file.c +++ b/src/gras/Transport/transport_plugin_file.c @@ -1,35 +1,33 @@ -/* $Id$ */ - /* File transport - send/receive a bunch of bytes from a file */ -/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ +/* Copyright (c) 2004, 2005, 2006, 2007, 2009, 2010. The SimGrid Team. + * 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. */ #include "portable.h" -#include "transport_private.h" - -#if 0 -# include -#endif +#include "gras/Transport/transport_private.h" +#include "xbt/ex.h" +#include "xbt/xbt_socket_private.h" +#include "gras/Msg/msg_interface.h" /* gras_msg_listener_awake */ -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(trp_file,transport, - "Pseudo-transport to write to/read from a file"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_trp_file, gras_trp, + "Pseudo-transport to write to/read from a file"); /*** - *** Prototypes + *** Prototypes ***/ -void gras_trp_file_close(gras_socket_t sd); - -xbt_error_t gras_trp_file_chunk_send(gras_socket_t sd, - const char *data, - long int size); +void gras_trp_file_close(xbt_socket_t sd); -xbt_error_t gras_trp_file_chunk_recv(gras_socket_t sd, - char *data, - long int size); +void gras_trp_file_chunk_send_raw(xbt_socket_t sd, + const char *data, + unsigned long int size); +void gras_trp_file_chunk_send(xbt_socket_t sd, const char *data, + unsigned long int size, int stable_ignored); +int gras_trp_file_chunk_recv(xbt_socket_t sd, + char *data, unsigned long int size); /*** *** Specific plugin part @@ -43,24 +41,49 @@ typedef struct { *** Specific socket part ***/ - +/*** + *** Info about who's speaking + ***/ +static int gras_trp_file_my_port(xbt_socket_t s) { + THROW_UNIMPLEMENTED; +} +static int gras_trp_file_peer_port(xbt_socket_t s) { + THROW_UNIMPLEMENTED; +} +static const char* gras_trp_file_peer_name(xbt_socket_t s) { + THROW_UNIMPLEMENTED; +} +static const char* gras_trp_file_peer_proc(xbt_socket_t s) { + THROW_UNIMPLEMENTED; +} +static void gras_trp_file_peer_proc_set(xbt_socket_t s,char *name) { + THROW_UNIMPLEMENTED; +} /*** *** Code ***/ -xbt_error_t -gras_trp_file_setup(gras_trp_plugin_t *plug) { +void gras_trp_file_setup(xbt_trp_plugin_t plug) +{ - gras_trp_file_plug_data_t *file = xbt_new(gras_trp_file_plug_data_t,1); + gras_trp_file_plug_data_t *file = xbt_new(gras_trp_file_plug_data_t, 1); FD_ZERO(&(file->incoming_socks)); + plug->my_port = gras_trp_file_my_port; + plug->peer_port = gras_trp_file_peer_port; + plug->peer_name = gras_trp_file_peer_name; + plug->peer_proc = gras_trp_file_peer_proc; + plug->peer_proc_set = gras_trp_file_peer_proc_set; + 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; - return no_error; + plug->raw_send = gras_trp_file_chunk_send_raw; + plug->send = gras_trp_file_chunk_send; + + plug->raw_recv = plug->recv = gras_trp_file_chunk_recv; + + plug->data = (void *) file; } /** @@ -70,40 +93,37 @@ gras_trp_file_setup(gras_trp_plugin_t *plug) { * * This only possible in RL, and is mainly for debugging. */ -xbt_error_t -gras_socket_client_from_file(const char*path, - /* OUT */ gras_socket_t *dst) { - xbt_error_t errcode; - gras_trp_plugin_t *trp; +xbt_socket_t gras_socket_client_from_file(const char *path) +{ + xbt_socket_t res; - xbt_assert0(gras_if_RL(), - "Cannot use file as socket in the simulator"); + xbt_assert(gras_if_RL(), "Cannot use file as socket in the simulator"); - gras_trp_socket_new(0,dst); - - TRY(gras_trp_plugin_get_by_name("file",&trp)); - (*dst)->plugin=trp; + xbt_socket_new_ext(0, &res, xbt_trp_plugin_get_by_name("file"), 0, 0); if (strcmp("-", path)) { - (*dst)->sd = open(path, O_WRONLY|O_CREAT | O_BINARY, S_IRUSR|S_IWUSR|S_IRGRP ); - - if ( (*dst)->sd < 0) { - RAISE2(system_error, - "Cannot create a client socket from file %s: %s", - path, strerror(errno)); + res->sd = + open(path, O_TRUNC | O_WRONLY | O_CREAT | O_BINARY, + S_IRUSR | S_IWUSR | S_IRGRP); + + if (res->sd < 0) { + THROWF(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'); - - return no_error; + XBT_DEBUG("sock_client_from_file(%s): sd=%d in=%c out=%c accept=%c", + path, + 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; } /** @@ -113,62 +133,58 @@ gras_socket_client_from_file(const char*path, * * This only possible in RL, and is mainly for debugging. */ -xbt_error_t -gras_socket_server_from_file(const char*path, - /* OUT */ gras_socket_t *dst) { - xbt_error_t errcode; - gras_trp_plugin_t *trp; - - xbt_assert0(gras_if_RL(), - "Cannot use file as socket in the simulator"); - - gras_trp_socket_new(1,dst); +xbt_socket_t gras_socket_server_from_file(const char *path) +{ + xbt_socket_t res; - TRY(gras_trp_plugin_get_by_name("file",&trp)); - (*dst)->plugin=trp; + xbt_assert(gras_if_RL(), "Cannot use file as socket in the simulator"); + xbt_socket_new_ext(1, &res, xbt_trp_plugin_get_by_name("file"), 0, 0); if (strcmp("-", path)) { - (*dst)->sd = open(path, O_RDONLY | O_BINARY); + res->sd = open(path, O_RDONLY | O_BINARY); - if ( (*dst)->sd < 0) { - RAISE2(system_error, - "Cannot create a server socket from file %s: %s", - path, strerror(errno)); + if (res->sd < 0) { + THROWF(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'); + XBT_DEBUG("sd=%d in=%c out=%c accept=%c", + res->sd, + res->incoming ? 'y' : 'n', + res->outgoing ? 'y' : 'n', res->accepting ? 'y' : 'n'); - return no_error; + xbt_dynar_push(((gras_trp_procdata_t) + gras_libdata_by_id(gras_trp_libdata_id))->sockets, &res); + gras_msg_listener_awake(); + return res; } -void gras_trp_file_close(gras_socket_t sock){ +void gras_trp_file_close(xbt_socket_t sock) +{ gras_trp_file_plug_data_t *data; - - if (!sock) return; /* close only once */ - data=sock->plugin->data; + + if (!sock) + return; /* close only once */ + data = sock->plugin->data; if (sock->sd == 0) { - DEBUG0("Do not close stdin"); + XBT_DEBUG("Do not close stdin"); } else if (sock->sd == 1) { - DEBUG0("Do not close stdout"); + XBT_DEBUG("Do not close stdout"); } else { - DEBUG1("close file connection %d", sock->sd); + XBT_DEBUG("close file connection %d", sock->sd); /* forget about the socket */ FD_CLR(sock->sd, &(data->incoming_socks)); /* close the socket */ - if(close(sock->sd) < 0) { - WARN2("error while closing file %d: %s", - sock->sd, strerror(errno)); + if (close(sock->sd) < 0) { + XBT_WARN("error while closing file %d: %s", sock->sd, strerror(errno)); } } } @@ -178,70 +194,83 @@ void gras_trp_file_close(gras_socket_t sock){ * * Send data on a file pseudo-socket */ -xbt_error_t -gras_trp_file_chunk_send(gras_socket_t sock, - const char *data, - long int size) { - - xbt_assert0(sock->outgoing, "Cannot write on client file socket"); - xbt_assert0(size >= 0, "Cannot send a negative amount of data"); +void +gras_trp_file_chunk_send(xbt_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(xbt_socket_t sock, + const char *data, unsigned long int size) +{ + + xbt_assert(sock->outgoing, "Cannot write on client file socket"); + xbt_assert(size >= 0, "Cannot send a negative amount of data"); while (size) { int status = 0; - - DEBUG3("write(%d, %p, %ld);", sock->sd, data, (long int)size); - status = write(sock->sd, data, (long int)size); - + + XBT_DEBUG("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", - sock->sd, data, (int)size, - strerror(errno)); + THROWF(system_error, 0, "write(%d,%p,%d) failed: %s", + sock->sd, data, (int) size, strerror(errno)); } - + if (status) { - size -= status; - data += status; + size -= status; + data += status; } else { - RAISE0(system_error,"file descriptor closed"); + THROWF(system_error, 0, "file descriptor closed"); } } - - return no_error; } + /** * gras_trp_file_chunk_recv: * * Receive data on a file pseudo-socket. */ -xbt_error_t -gras_trp_file_chunk_recv(gras_socket_t sock, - char *data, - long int size) { - - 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"); - +int +gras_trp_file_chunk_recv(xbt_socket_t sock, + char *data, unsigned long int size) +{ + + int got = 0; + + xbt_assert(sock, "Cannot recv on an NULL socket"); + xbt_assert(sock->incoming, "Cannot recv on client file socket"); + xbt_assert(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, (long int)size); - DEBUG3("read(%d, %p, %ld);", sock->sd, data, size); - - if (status == -1) { - RAISE4(system_error,"read(%d,%p,%d) failed: %s", - sock->sd, data, (int)size, - strerror(errno)); + + status = read(sock->sd, data + got, (long int) size); + XBT_DEBUG("read(%d, %p, %ld);", sock->sd, data + got, size); + + if (status < 0) { + THROWF(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"); + THROWF(system_error, errno, "file descriptor closed after %d bytes", + got); } } - - return no_error; + return got; } -