Current state. See changelog, sorry, I'm out of time

[simgrid.git] / 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 8bbb942..11f1a29 100644 (file)
--- a/src/gras/Transport/transport_plugin_file.c
+++ b/src/gras/Transport/transport_plugin_file.c
@@ -9,18 +9,16 @@
    under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <errno.h>
+#include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <unistd.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;
+GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(trp_file,transport,
+       "Pseudo-transport to write to/read from a file");
 
 /***
  *** Prototypes 
@@ -28,14 +26,13 @@ typedef struct {
 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);
+                                     const char *data,
+                                     long int size);
 
 gras_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 +40,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;
-
-  FD_ZERO(&(specif->incoming_socks));
+gras_trp_file_setup(gras_trp_plugin_t *plug) {
 
-  res->name = strdup("file");
-  res->socket_client = NULL;
-  res->socket_server = NULL;
-  res->socket_accept = NULL;
-  res->socket_close  = gras_trp_file_close;
+  gras_trp_file_plug_data_t *file = gras_new(gras_trp_file_plug_data_t,1);
 
-  res->chunk_send    = gras_trp_file_chunk_send;
-  res->chunk_recv    = gras_trp_file_chunk_recv;
+  FD_ZERO(&(file->incoming_socks));
 
-  res->specific      = (void*)specif;
-  res->free_specific = gras_trp_file_free_specific;
+  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;
 
-  *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:
  *
@@ -100,7 +82,7 @@ gras_socket_client_from_file(const char*path,
   gras_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;
@@ -123,14 +105,7 @@ gras_socket_client_from_file(const char*path,
         (*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;
 }
 
@@ -150,7 +125,7 @@ gras_socket_server_from_file(const char*path,
   gras_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;
@@ -174,22 +149,14 @@ 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;
+  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,7 +166,7 @@ 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) {
@@ -216,16 +183,17 @@ void gras_trp_file_close(gras_socket_t *sock){
  */
 gras_error_t 
 gras_trp_file_chunk_send(gras_socket_t *sock,
-                        char *data,
-                        size_t size) {
+                        const char *data,
+                        long int size) {
   
+  gras_assert0(sock->outgoing, "Cannot write on client file socket");
   gras_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",
@@ -251,16 +219,16 @@ gras_trp_file_chunk_send(gras_socket_t *sock,
 gras_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(sock->incoming, "Cannot recv on client file socket");
   gras_assert0(size >= 0, "Cannot receive a negative amount of data");
   
   while (size) {
     int status = 0;
     
-    status = read(sock->sd, data, (size_t)size);
+    status = read(sock->sd, data, (long int)size);
     DEBUG3("read(%d, %p, %ld);", sock->sd, data, size);
     
     if (status == -1) {