X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f5e8daaa6e9f74521068aa75837200bcd182ea6..a093e1d3dad9c1e9af6473e1f96e7d5f76a4dac1:/src/gras/Virtu/virtu_sg.h

diff --git a/src/gras/Virtu/virtu_sg.h b/src/gras/Virtu/virtu_sg.h
index 16e4f00a30..7554d19b08 100644
--- a/src/gras/Virtu/virtu_sg.h
+++ b/src/gras/Virtu/virtu_sg.h
@@ -11,12 +11,12 @@
 
 #include "gras/Virtu/virtu_private.h"
 #include "xbt/dynar.h"
-#include "simix/simix.h"        /* SimGrid header */
+#include "simgrid/simix.h"        /* SimGrid header */
 #include "gras/Transport/transport_private.h"
 
 typedef struct {
   int port;                     /* list of ports used by a server socket */
-  int meas:1;                   /* (boolean) the channel is for measurements or for messages */
+  unsigned meas:1;              /* (boolean) the channel is for measurements or for messages */
   smx_process_t server;
   smx_rdv_t rdv;
 } s_gras_sg_portrec_t, *gras_sg_portrec_t;
@@ -29,17 +29,26 @@ typedef struct {
 
 } gras_hostdata_t;
 
-/* data for each socket (FIXME: find a better location for that)*/
+/* data for each socket (FIXME: find a better location for that) */
 typedef struct {
   smx_process_t server;
   smx_process_t client;
 
   smx_rdv_t rdv_server;         /* The rendez-vous point to use */
   smx_rdv_t rdv_client;         /* The rendez-vous point to use */
-  smx_comm_t comm_recv;         /* The comm of irecv on receiver side */
+  smx_action_t comm_recv;       /* The comm of irecv on receiver side */
+  gras_msg_t msg;               /* The destination buffer of the comm data */
+
+  int server_port;
+  int client_port;
 } s_gras_trp_sg_sock_data_t, *gras_trp_sg_sock_data_t;
 
 
+/** \brief Returns if I am on the server side of this socket (either server or listener of server) */
+/* FIXME make an im_the_server function in each socket plugin */
+int gras_socket_im_the_server(xbt_socket_t sock);
+
+
 void *gras_libdata_by_name_from_remote(const char *name, smx_process_t p);
 /* The same function by id would be really dangerous.
  *