Fix make dist.

[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 51090f7..7554d19 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,15 +11,15 @@
 
 #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;                     /* (boolean) the channel is for measurements or for messages */
-  smx_process_t process;
-  gras_socket_t socket;
-} gras_sg_portrec_t;
+  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;
 
 /* Data for each host */
 typedef struct {
@@ -30,17 +29,24 @@ 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 from_process;
-  smx_process_t to_process;
+  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_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;
 
-  smx_host_t to_host;           /* Who's on other side */
 
-  smx_cond_t cond;
-  smx_mutex_t mutex;
-  gras_socket_t to_socket;
-} 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);
@@ -51,4 +57,4 @@ void *gras_libdata_by_name_from_remote(const char *name, smx_process_t p);
  * order.
  */
 
-#endif /* VIRTU_SG_H */
+#endif                          /* VIRTU_SG_H */