X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ed8aacb67a4cd91be9445cb8f3c3d149b357460a..504b4d20dd2db9ea1eaa9c4b390b2a412d7c9779:/src/gras/Virtu/virtu_sg.h diff --git a/src/gras/Virtu/virtu_sg.h b/src/gras/Virtu/virtu_sg.h index c2676dba9a..dc654a8922 100644 --- a/src/gras/Virtu/virtu_sg.h +++ b/src/gras/Virtu/virtu_sg.h @@ -12,21 +12,19 @@ #include "gras/Virtu/virtu_private.h" #include "xbt/dynar.h" -#include "msg/msg.h" /* SimGrid header */ - -#define XBT_MAX_CHANNEL 10 +#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 meas; /* (boolean) the channel is for measurements 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 refcount; - int proc[XBT_MAX_CHANNEL]; /* PID of who's connected to each channel */ - /* If =0, then free */ xbt_dynar_t ports; @@ -34,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 */ - - m_host_t to_host; /* Who's on other side */ - m_channel_t to_chan;/* Channel on which the other side is earing */ + 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; } 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 */