X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/063c63642a29000a011c0d6176d30eb62a4e0dca..18c57b27dd71ee7839c6a90368c845886a87d638:/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 ca8aadfd0e..c26b83780e 100644 --- a/src/gras/Transport/transport_plugin_file.c +++ b/src/gras/Transport/transport_plugin_file.c @@ -1,8 +1,7 @@ -/* $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. */ @@ -21,9 +20,9 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_trp_file, gras_trp, void gras_trp_file_close(gras_socket_t sd); 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, + 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, @@ -41,7 +40,24 @@ typedef struct { *** Specific socket part ***/ - +/*** + *** Info about who's speaking + ***/ +static int gras_trp_file_my_port(gras_socket_t s) { + THROW_UNIMPLEMENTED; +} +static int gras_trp_file_peer_port(gras_socket_t s) { + THROW_UNIMPLEMENTED; +} +static const char* gras_trp_file_peer_name(gras_socket_t s) { + THROW_UNIMPLEMENTED; +} +static const char* gras_trp_file_peer_proc(gras_socket_t s) { + THROW_UNIMPLEMENTED; +} +static void gras_trp_file_peer_proc_set(gras_socket_t s,char *name) { + THROW_UNIMPLEMENTED; +} /*** *** Code @@ -53,6 +69,12 @@ void gras_trp_file_setup(gras_trp_plugin_t plug) 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->raw_send = gras_trp_file_chunk_send_raw; @@ -74,7 +96,7 @@ gras_socket_t gras_socket_client_from_file(const char *path) { gras_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, &res); @@ -82,11 +104,11 @@ gras_socket_t gras_socket_client_from_file(const char *path) if (strcmp("-", path)) { res->sd = - open(path, O_TRUNC | O_WRONLY | O_CREAT | O_BINARY, - S_IRUSR | S_IWUSR | S_IRGRP); + open(path, O_TRUNC | O_WRONLY | O_CREAT | O_BINARY, + S_IRUSR | S_IWUSR | S_IRGRP); if (res->sd < 0) { - THROW2(system_error, 0, + THROWF(system_error, 0, "Cannot create a client socket from file %s: %s", path, strerror(errno)); } @@ -94,11 +116,11 @@ gras_socket_t gras_socket_client_from_file(const char *path) res->sd = 1; /* stdout */ } - DEBUG5("sock_client_from_file(%s): sd=%d in=%c out=%c accept=%c", + 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->is_master ? '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); @@ -116,7 +138,7 @@ gras_socket_t gras_socket_server_from_file(const char *path) { gras_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(1, &res); @@ -127,7 +149,7 @@ gras_socket_t gras_socket_server_from_file(const char *path) res->sd = open(path, O_RDONLY | O_BINARY); if (res->sd < 0) { - THROW2(system_error, 0, + THROWF(system_error, 0, "Cannot create a server socket from file %s: %s", path, strerror(errno)); } @@ -135,10 +157,10 @@ gras_socket_t gras_socket_server_from_file(const char *path) res->sd = 0; /* stdin */ } - DEBUG4("sd=%d in=%c out=%c accept=%c", + XBT_DEBUG("sd=%d in=%c out=%c accept=%c", res->sd, res->incoming ? 'y' : 'n', - res->outgoing ? 'y' : 'n', res->is_master ? '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); @@ -155,18 +177,18 @@ void gras_trp_file_close(gras_socket_t sock) 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)); + XBT_WARN("error while closing file %d: %s", sock->sd, strerror(errno)); } } } @@ -189,17 +211,17 @@ gras_trp_file_chunk_send_raw(gras_socket_t sock, const char *data, unsigned long int size) { - xbt_assert0(sock->outgoing, "Cannot write on client file socket"); - xbt_assert0(size >= 0, "Cannot send a negative amount of data"); + 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); + XBT_DEBUG("write(%d, %p, %ld);", sock->sd, data, (long int) size); status = write(sock->sd, data, (long int) size); if (status == -1) { - THROW4(system_error, 0, "write(%d,%p,%d) failed: %s", + THROWF(system_error, 0, "write(%d,%p,%d) failed: %s", sock->sd, data, (int) size, strerror(errno)); } @@ -207,7 +229,7 @@ gras_trp_file_chunk_send_raw(gras_socket_t sock, size -= status; data += status; } else { - THROW0(system_error, 0, "file descriptor closed"); + THROWF(system_error, 0, "file descriptor closed"); } } } @@ -224,9 +246,9 @@ gras_trp_file_chunk_recv(gras_socket_t sock, 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"); + 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; @@ -239,10 +261,10 @@ gras_trp_file_chunk_recv(gras_socket_t sock, int status = 0; status = read(sock->sd, data + got, (long int) size); - DEBUG3("read(%d, %p, %ld);", sock->sd, data + got, size); + XBT_DEBUG("read(%d, %p, %ld);", sock->sd, data + got, size); if (status < 0) { - THROW4(system_error, 0, "read(%d,%p,%d) failed: %s", + THROWF(system_error, 0, "read(%d,%p,%d) failed: %s", sock->sd, data + got, (int) size, strerror(errno)); } @@ -250,7 +272,7 @@ gras_trp_file_chunk_recv(gras_socket_t sock, size -= status; got += status; } else { - THROW1(system_error, errno, "file descriptor closed after %d bytes", + THROWF(system_error, errno, "file descriptor closed after %d bytes", got); } }