X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b52dc83342769c5c4e6dc36e05d30756a732fa20..85745e7eca5b947c62d42752c324b6320fd14998:/src/gras/Transport/transport_interface.h

diff --git a/src/gras/Transport/transport_interface.h b/src/gras/Transport/transport_interface.h
index 78421a5ba4..595deabe44 100644
--- a/src/gras/Transport/transport_interface.h
+++ b/src/gras/Transport/transport_interface.h
@@ -4,11 +4,10 @@
 
 /* module's public interface exported within GRAS, but not to end user.     */
 
-/* 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. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #ifndef GRAS_TRP_INTERFACE_H
 #define GRAS_TRP_INTERFACE_H
@@ -16,22 +15,22 @@
 /***
  *** Main user functions
  ***/
-gras_error_t gras_trp_chunk_send(gras_socket_t *sd,
+xbt_error_t gras_trp_chunk_send(gras_socket_t sd,
 				 char *data,
 				 long int size);
-gras_error_t gras_trp_chunk_recv(gras_socket_t *sd,
+xbt_error_t gras_trp_chunk_recv(gras_socket_t sd,
 				 char *data,
 				 long int size);
-gras_error_t gras_trp_flush(gras_socket_t *sd);
+xbt_error_t gras_trp_flush(gras_socket_t sd);
 
 /* Find which socket needs to be read next */
-gras_error_t 
+xbt_error_t 
 gras_trp_select(double timeout,
-		gras_socket_t **dst);
+		gras_socket_t *dst);
 
 
 /***
- *** Plugin mecanism 
+ *** Plugin mechanism 
  ***/
 
 /* A plugin type */
@@ -41,33 +40,31 @@ typedef struct gras_trp_plugin_ gras_trp_plugin_t;
 struct gras_trp_plugin_ {
   char          *name;
  
-  /* dst pointers are created and initialized with default values 
-     before call to socket_client/server*/
-  gras_error_t (*socket_client)(gras_trp_plugin_t *self,
-				const char *host,
-				unsigned short port,
-				/* OUT */ gras_socket_t *dst);
-  gras_error_t (*socket_server)(gras_trp_plugin_t *self,
-				unsigned short port,
-				/* OUT */ gras_socket_t *dst);
+  /* dst pointers are created and initialized with default values
+     before call to socket_client/server. 
+     Retrive the info you need from there. */
+  xbt_error_t (*socket_client)(gras_trp_plugin_t *self,
+				gras_socket_t      dst);
+  xbt_error_t (*socket_server)(gras_trp_plugin_t *self,
+				gras_socket_t      dst);
    
-  gras_error_t (*socket_accept)(gras_socket_t  *sock,
-				/* OUT */gras_socket_t **dst);
+  xbt_error_t (*socket_accept)(gras_socket_t  sock,
+				gras_socket_t *dst);
    
    
    /* socket_close() is responsible of telling the OS that the socket is over,
     but should not free the socket itself (beside the specific part) */
-  void         (*socket_close)(gras_socket_t *sd);
+  void         (*socket_close)(gras_socket_t sd);
     
-  gras_error_t (*chunk_send)(gras_socket_t *sd,
-			     const char *data,
-			     long int size);
-  gras_error_t (*chunk_recv)(gras_socket_t *sd,
-			     char *Data,
-			     long int size);
+  xbt_error_t (*chunk_send)(gras_socket_t sd,
+                            const char *data,
+			    unsigned long int size);
+  xbt_error_t (*chunk_recv)(gras_socket_t sd,
+			    char *data,
+			    unsigned long int size);
 
   /* flush has to make sure that the pending communications are achieved */
-  gras_error_t (*flush)(gras_socket_t *sd);
+  xbt_error_t (*flush)(gras_socket_t sd);
 
   void          *data; /* plugin-specific data */
  
@@ -76,8 +73,19 @@ struct gras_trp_plugin_ {
   void         (*exit)(gras_trp_plugin_t *);
 };
 
-gras_error_t
+xbt_error_t
 gras_trp_plugin_get_by_name(const char *name,
 			    gras_trp_plugin_t **dst);
 
+/* Data of this module specific to each process
+ * (used by sg_process.c to cleanup the SG channel cruft)
+ */
+typedef struct {
+   /* SG only elements. In RL, they are part of the OS ;) */
+   int chan;    /* Formated messages channel */
+   int measChan; /* Unformated echange channel for performance measurement*/
+   xbt_dynar_t sockets; /* all sockets known to this process */
+   
+} s_gras_trp_procdata_t,*gras_trp_procdata_t;
+
 #endif /* GRAS_TRP_INTERFACE_H */