Define correctly variables for windows.

[simgrid.git] / src / gras / Virtu / virtu_sg.h

diff --git a/src/gras/Virtu/virtu_sg.h b/src/gras/Virtu/virtu_sg.h
index 9e2f4f5..f62517c 100644 (file)
--- a/src/gras/Virtu/virtu_sg.h
+++ b/src/gras/Virtu/virtu_sg.h
@@ -1,8 +1,7 @@
-/* $Id$ */
-
 /* 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. */
@@ -12,14 +11,15 @@
 
 #include "gras/Virtu/virtu_private.h"
 #include "xbt/dynar.h"
-#include "simix/simix.h" /* SimGrid header */
+#include "simix/simix.h"        /* SimGrid header */
 #include "gras/Transport/transport_private.h"
 
 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;
+  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; /* process listening */
+  smx_rdv_t rdv; /* rendez-vous point to the listener */
+//  gras_socket_t socket; FIXME KILLME
 } gras_sg_portrec_t;
 
 /* Data for each host */
@@ -32,14 +32,15 @@ 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_host_t to_host;   /* Who's on other side */
-   
-   smx_cond_t cond;
-   smx_mutex_t mutex;
-   gras_socket_t to_socket;
+  smx_process_t from_process;
+  smx_process_t to_process;
+
+  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 */
+  int im_server:1;
+  smx_comm_t comm_recv; /* The comm of irecv on receiving sockets */
 } gras_trp_sg_sock_data_t;
 
 
@@ -50,6 +51,5 @@ void *gras_libdata_by_name_from_remote(const char *name, smx_process_t p);
  * the same order, which is wrong if they init amok modules in different
  * order.
  */
-   
-   
+
 #endif /* VIRTU_SG_H */