A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Partial fix of GRAS: gras-ping-sg now works again
[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
1b72191
..
0180b9a
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 */
/* 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. */
/* 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 "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 {
#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;
+ int port;
/* list of ports used by a server socket */
+
int 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 {
/* Data for each host */
typedef struct {
@@
-32,17
+31,16
@@
typedef struct {
/* data for each socket (FIXME: find a better location for that)*/
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_process_t server;
+ smx_process_t client;
- 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 */
+ smx_comm_t comm_recv; /* The comm of irecv on receiver side */
- smx_cond_t cond;
- smx_mutex_t mutex;
- gras_socket_t to_socket;
-} gras_trp_sg_sock_data_t;
+ int server_port;
+ int client_port;
+} s_gras_trp_sg_sock_data_t, *gras_trp_sg_sock_data_t;
void *gras_libdata_by_name_from_remote(const char *name, smx_process_t p);
void *gras_libdata_by_name_from_remote(const char *name, smx_process_t p);
@@
-52,6
+50,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.
*/
* the same order, which is wrong if they init amok modules in different
* order.
*/
-
-
-#endif /* VIRTU_SG_H */
+
+#endif /* VIRTU_SG_H */