X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4a201b7ceece70d2bc461ac48c8b746a36d07243..1a2592601e29b027872580cbfc364194f8b01ba6:/src/gras/Virtu/virtu_sg.h

diff --git a/src/gras/Virtu/virtu_sg.h b/src/gras/Virtu/virtu_sg.h
index d9e291daba..0180b9abbe 100644
--- a/src/gras/Virtu/virtu_sg.h
+++ b/src/gras/Virtu/virtu_sg.h
@@ -1,6 +1,7 @@
 /* virtu_sg - specific GRAS implementation for simulator                    */
 
-/* Copyright (c) 2003, 2004 Martin Quinson. All rights reserved.            */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2009, 2010. The SimGrid Team.
+ * 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. */
@@ -15,10 +16,10 @@
 
 typedef struct {
   int port;                     /* list of ports used by a server socket */
-  int meas;                     /* (boolean) the channel is for measurements or for messages */
-  smx_process_t process;
-  gras_socket_t socket;
-} gras_sg_portrec_t;
+  int 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;
 
 /* Data for each host */
 typedef struct {
@@ -30,15 +31,16 @@ typedef struct {
 
 /* data for each socket (FIXME: find a better location for that)*/
 typedef struct {
-  smx_process_t from_process;
-  smx_process_t to_process;
+  smx_process_t server;
+  smx_process_t client;
 
-  smx_host_t to_host;           /* Who's on other side */
+  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_cond_t cond;
-  smx_mutex_t mutex;
-  gras_socket_t to_socket;
-} gras_trp_sg_sock_data_t;
+  int server_port;
+  int client_port;
+} s_gras_trp_sg_sock_data_t, *gras_trp_sg_sock_data_t;
 
 
 void *gras_libdata_by_name_from_remote(const char *name, smx_process_t p);
@@ -49,4 +51,4 @@ void *gras_libdata_by_name_from_remote(const char *name, smx_process_t p);
  * order.
  */
 
-#endif /* VIRTU_SG_H */
+#endif                          /* VIRTU_SG_H */