Revert "try to port the gras simulation side to the new smx_network infrastructure...

[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 91711e8..51090f7 100644 (file)
--- a/src/gras/Virtu/virtu_sg.h
+++ b/src/gras/Virtu/virtu_sg.h
@@ -2,30 +2,29 @@
 
 /* virtu_sg - specific GRAS implementation for simulator                    */
 
-/* Authors: Martin Quinson                                                  */
-/* Copyright (C) 2003,2004 da GRAS posse.                                   */
+/* Copyright (c) 2003, 2004 Martin Quinson. 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. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #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 "simix/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 */
+  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;
 
 /* 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;
 
@@ -33,12 +32,23 @@ typedef struct {
 
 /* 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 from_process;
+  smx_process_t to_process;
+
+  smx_host_t to_host;           /* Who's on other side */
 
-  m_host_t to_host;   /* Who's on other side */
-  m_channel_t to_chan;/* Channel on which the other side is earing */
+  smx_cond_t cond;
+  smx_mutex_t mutex;
+  gras_socket_t to_socket;
 } 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 */