X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c42000db0f347a26ac1645d830ac949194ec4da0..78492f2b2d3a263a55beea7aa2a1fd00c0743524:/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 11f1a29cda..a4bb75915e 100644
--- a/src/gras/Transport/transport_plugin_file.c
+++ b/src/gras/Transport/transport_plugin_file.c
@@ -2,34 +2,36 @@
 
 /* File transport - send/receive a bunch of bytes from a file               */
 
-/* Authors: Martin Quinson                                                  */
-/* Copyright (C) 2004 Martin Quinson.                                       */
+/* Copyright (c) 2004 Martin Quinson. 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. */
-
-#include <errno.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include "portable.h"
 #include "transport_private.h"
 
-GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(trp_file,transport,
+#if 0
+#  include <errno.h>
+#  include <sys/time.h>
+#  include <sys/types.h>
+#  include <sys/stat.h>
+#  include <fcntl.h>
+#  include <unistd.h>
+#endif 
+
+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 +53,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 +75,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);
@@ -88,7 +90,7 @@ gras_socket_client_from_file(const char*path,
   (*dst)->plugin=trp;
 
   if (strcmp("-", path)) {
-    (*dst)->sd = open(path, O_WRONLY|O_CREAT, S_IRUSR|S_IWUSR|S_IRGRP );
+    (*dst)->sd = open(path, O_WRONLY|O_CREAT | O_BINARY, S_IRUSR|S_IWUSR|S_IRGRP );
     
     if ( (*dst)->sd < 0) {
       RAISE2(system_error,
@@ -116,13 +118,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);
@@ -132,7 +134,7 @@ gras_socket_server_from_file(const char*path,
 
 
   if (strcmp("-", path)) {
-    (*dst)->sd = open(path, O_RDONLY );
+    (*dst)->sd = open(path, O_RDONLY | O_BINARY);
 
     if ( (*dst)->sd < 0) {
       RAISE2(system_error,
@@ -152,7 +154,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 +183,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 +218,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;