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
/
Transport
/
transport_private.h
diff --git
a/src/gras/Transport/transport_private.h
b/src/gras/Transport/transport_private.h
index
b242ccb
..
ad0f55d
100644
(file)
--- a/
src/gras/Transport/transport_private.h
+++ b/
src/gras/Transport/transport_private.h
@@
-1,10
+1,9
@@
-/* $Id$ */
-
/* transport - low level communication (send/receive bunches of bytes) */
/* module's private interface masked even to other parts of GRAS. */
/* transport - low level communication (send/receive bunches of bytes) */
/* module's private interface masked even to other parts of GRAS. */
-/* Copyright (c) 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. */
@@
-56,7
+55,7
@@
typedef struct s_gras_socket {
int incoming:1; /* true if we can read from this sock */
int outgoing:1; /* true if we can write on this sock */
int incoming:1; /* true if we can read from this sock */
int outgoing:1; /* true if we can write on this sock */
- int
is_master:1; /* true if master incoming sock
*/
+ int
accepting:1; /* true if master incoming sock in tcp
*/
int meas:1; /* true if this is an experiment socket instead of messaging */
int valid:1; /* false if a select returned that the peer quitted, forcing us to "close" the socket */
int moredata:1; /* TCP socket use a buffer and read operation get as much
int meas:1; /* true if this is an experiment socket instead of messaging */
int valid:1; /* false if a select returned that the peer quitted, forcing us to "close" the socket */
int moredata:1; /* TCP socket use a buffer and read operation get as much
@@
-75,10
+74,6
@@
typedef struct s_gras_socket {
Field here to remember it when accepting */
int sd;
Field here to remember it when accepting */
int sd;
- int port; /* port on this side */
- int peer_port; /* port on the other side */
- char *peer_name; /* hostname of the other side */
- char *peer_proc; /* process on the other side */
void *data; /* plugin specific data */
void *data; /* plugin specific data */
@@
-116,4
+111,4
@@
void gras_trp_sg_setup(gras_trp_plugin_t plug);
gras_socket_t gras_trp_buf_init_sock(gras_socket_t sock);
gras_socket_t gras_trp_buf_init_sock(gras_socket_t sock);
-#endif /* GRAS_TRP_PRIVATE_H */
+#endif
/* GRAS_TRP_PRIVATE_H */