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

diff --git a/src/gras/Virtu/virtu_sg.h b/src/gras/Virtu/virtu_sg.h
index f9b9416518..7554d19b08 100644
--- 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. */
@@ -10,34 +9,52 @@
 #ifndef VIRTU_SG_H
 #define VIRTU_SG_H
 
-#include "gras/Virtu/virtu_interface.h"
-#include <msg.h> /* SimGrid header */
-
-#define XBT_MAX_CHANNEL 10
+#include "gras/Virtu/virtu_private.h"
+#include "xbt/dynar.h"
+#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 tochan; /* the channel it points to */
-  int raw;   /* (boolean) the channel is in raw mode or for messages */
-} gras_sg_portrec_t;
+  int port;                     /* list of ports used by a server socket */
+  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 {
-  int proc[XBT_MAX_CHANNEL]; /* PID of who's connected to each channel */
-                              /* If =0, then free */
+  int refcount;
 
   xbt_dynar_t ports;
 
 } 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 {
-  int from_PID;    /* process which sent this message */
-  int to_PID;      /* process to which this message is destinated */
+  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;
+
+
+/** \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);
 
-  m_host_t to_host;   /* Who's on other side */
-  m_channel_t to_chan;/* Channel on which the other side is earing */
-} gras_trp_sg_sock_data_t;
 
+void *gras_libdata_by_name_from_remote(const char *name, smx_process_t p);
+/* The same function by id would be really dangerous.
+ * 
+ * Indeed, it would rely on the fact that all process register libdatas in
+ * the same order, which is wrong if they init amok modules in different
+ * order.
+ */
 
-#endif /* VIRTU_SG_H */
+#endif                          /* VIRTU_SG_H */