First attempt on SURF design. I'd like a 5'10" short board with a swallow

[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 11f1a29..391d60d 100644 (file)
--- a/src/gras/Transport/transport_plugin_file.c
+++ b/src/gras/Transport/transport_plugin_file.c
@@ -17,19 +17,19 @@
 
 #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,
+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,
                                      long int size);
 
@@ -51,10 +51,10 @@ 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 = gras_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));
 
@@ -73,13 +73,13 @@ 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");
 
   gras_trp_socket_new(0,dst);
@@ -116,13 +116,13 @@ 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");
 
   gras_trp_socket_new(1,dst);
@@ -152,7 +152,7 @@ gras_socket_server_from_file(const char*path,
   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 */
@@ -181,13 +181,13 @@ 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,
+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;
@@ -216,14 +216,14 @@ 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,
                        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;