Renamed any gras stuff that was in xbt and should therefore be called

[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 ae1866e..391d60d 100644 (file)
--- a/src/gras/Transport/transport_plugin_file.c
+++ b/src/gras/Transport/transport_plugin_file.c
@@ -9,27 +9,29 @@
    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);
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(trp_file,transport,
+       "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);
+xbt_error_t gras_trp_file_chunk_send(gras_socket_t sd,
+                                     const char *data,
+                                     long int size);
 
-gras_error_t gras_trp_file_chunk_recv(gras_socket_t *sd,
+xbt_error_t gras_trp_file_chunk_recv(gras_socket_t sd,
                                      char *data,
-                                     size_t size);
+                                     long int size);
 
 
 /***
@@ -49,20 +51,16 @@ typedef struct {
 /***
  *** Code
  ***/
-gras_error_t
+xbt_error_t
 gras_trp_file_setup(gras_trp_plugin_t *plug) {
 
-  gras_trp_file_plug_data_t *file = malloc(sizeof(gras_trp_file_plug_data_t));
-  if (!file)
-    RAISE_MALLOC;
+  gras_trp_file_plug_data_t *file = xbt_new(gras_trp_file_plug_data_t,1);
 
   FD_ZERO(&(file->incoming_socks));
 
   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;
@@ -75,16 +73,16 @@ gras_trp_file_setup(gras_trp_plugin_t *plug) {
  *
  * This only possible in RL, and is mainly for debugging.
  */
-gras_error_t
+xbt_error_t
 gras_socket_client_from_file(const char*path,
-                            /* OUT */ gras_socket_t **dst) {
-  gras_error_t errcode;
+                            /* OUT */ gras_socket_t *dst) {
+  xbt_error_t errcode;
   gras_trp_plugin_t *trp;
 
-  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,dst);
 
   TRY(gras_trp_plugin_get_by_name("file",&trp));
   (*dst)->plugin=trp;
@@ -107,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_socketset_get(),dst);
-  if (errcode != no_error) {
-    free(*dst);
-    *dst = NULL;
-    return errcode;
-  }
-
+   
   return no_error;
 }
 
@@ -125,16 +116,16 @@ gras_socket_client_from_file(const char*path,
  *
  * This only possible in RL, and is mainly for debugging.
  */
-gras_error_t
+xbt_error_t
 gras_socket_server_from_file(const char*path,
-                            /* OUT */ gras_socket_t **dst) {
-  gras_error_t errcode;
+                            /* OUT */ gras_socket_t *dst) {
+  xbt_error_t errcode;
   gras_trp_plugin_t *trp;
 
-  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,dst);
 
   TRY(gras_trp_plugin_get_by_name("file",&trp));
   (*dst)->plugin=trp;
@@ -158,18 +149,10 @@ gras_socket_server_from_file(const char*path,
         (*dst)->outgoing?'y':'n',
         (*dst)->accepting?'y':'n');
 
-  /* register socket */
-  errcode = gras_dynar_push(gras_socketset_get(),dst);
-  if (errcode != no_error) {
-    free(*dst);
-    *dst = NULL;
-    return errcode;
-  }
-
   return no_error;
 }
 
-void gras_trp_file_close(gras_socket_t *sock){
+void gras_trp_file_close(gras_socket_t sock){
   gras_trp_file_plug_data_t *data;
   
   if (!sock) return; /* close only once */
@@ -198,19 +181,19 @@ 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) {
+xbt_error_t 
+gras_trp_file_chunk_send(gras_socket_t sock,
+                        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");
+  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",
@@ -233,19 +216,19 @@ gras_trp_file_chunk_send(gras_socket_t *sock,
  *
  * Receive data on a file pseudo-socket.
  */
-gras_error_t 
-gras_trp_file_chunk_recv(gras_socket_t *sock,
+xbt_error_t 
+gras_trp_file_chunk_recv(gras_socket_t sock,
                        char *data,
-                       size_t size) {
+                       long int size) {
 
-  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");
+  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");
   
   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) {