gras_trp_socket_new is in charge of pushing it into the set of known sockets

[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 74774ae..6a52c08 100644 (file)
--- a/src/gras/Transport/transport_plugin_file.c
+++ b/src/gras/Transport/transport_plugin_file.c
@@ -18,10 +18,6 @@
 
 GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(trp_file,transport);
 
-typedef struct {
-  int buffsize;
-} gras_trp_tcp_sock_specific_t;
-
 /***
  *** Prototypes 
  ***/
@@ -35,7 +31,6 @@ 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);
 
 /***
  *** Specific plugin part
@@ -43,47 +38,36 @@ 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_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)
+  gras_trp_file_plug_data_t *file = malloc(sizeof(gras_trp_file_plug_data_t));
+  if (!file)
     RAISE_MALLOC;
 
-  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->chunk_send   = gras_trp_file_chunk_send;
+  plug->chunk_recv   = gras_trp_file_chunk_recv;
 
-  res->specific      = (void*)specif;
-  res->free_specific = gras_trp_file_free_specific;
+  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:
  *
@@ -105,13 +89,8 @@ gras_socket_client_from_file(const char*path,
   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, 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;
 }
 
@@ -161,7 +134,7 @@ gras_socket_server_from_file(const char*path,
 
 
   if (strcmp("-", path)) {
-    (*dst)->sd = open(path, O_WRONLY );
+    (*dst)->sd = open(path, O_RDONLY );
 
     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;
+  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));
     }
   }
@@ -223,13 +188,14 @@ gras_trp_file_chunk_send(gras_socket_t *sock,
                         char *data,
                         size_t 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);\n", sock->sd, data, size);
     
     if (status == -1) {
       RAISE4(system_error,"write(%d,%p,%d) failed: %s",
@@ -257,15 +223,15 @@ 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(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);
-    DEBUG3("read(%d, %p, %ld);\n", sock->sd, data, size);
+    DEBUG3("read(%d, %p, %ld);", sock->sd, data, size);
     
     if (status == -1) {
       RAISE4(system_error,"read(%d,%p,%d) failed: %s",