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
Detect socket closed by peer in the transport layer, so that such things don't polute...
[simgrid.git]
/
src
/
gras
/
Transport
/
rl_transport.c
diff --git
a/src/gras/Transport/rl_transport.c
b/src/gras/Transport/rl_transport.c
index
b4d23e1
..
5b6b6ec
100644
(file)
--- a/
src/gras/Transport/rl_transport.c
+++ b/
src/gras/Transport/rl_transport.c
@@
-7,10
+7,10
@@
/* 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. */
+#include "xbt/ex.h"
#include "portable.h"
#include "gras/Transport/transport_private.h"
#include "portable.h"
#include "gras/Transport/transport_private.h"
-XBT_LOG_EXTERNAL_CATEGORY(transport);
-XBT_LOG_DEFAULT_CATEGORY(transport);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(gras_trp);
/**
* gras_trp_select:
/**
* gras_trp_select:
@@
-23,12
+23,8
@@
XBT_LOG_DEFAULT_CATEGORY(transport);
*
* if timeout>0 and no message there, wait at most that amount of time before giving up.
*/
*
* if timeout>0 and no message there, wait at most that amount of time before giving up.
*/
-xbt_error_t
-gras_trp_select(double timeout,
- gras_socket_t *dst) {
-
- xbt_error_t errcode;
- xbt_dynar_t sockets= gras_socketset_get();
+gras_socket_t gras_trp_select(double timeout) {
+ xbt_dynar_t sockets= ((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->sockets;
int done = -1;
double wakeup = gras_os_time() + timeout;
double now = 0;
int done = -1;
double wakeup = gras_os_time() + timeout;
double now = 0;
@@
-58,13
+54,15
@@
gras_trp_select(double timeout,
# endif /* !USE_SYSCONF */
#endif
# endif /* !USE_SYSCONF */
#endif
- *dst=NULL;
while (done == -1) {
if (timeout > 0) { /* did we timeout already? */
now = gras_os_time();
while (done == -1) {
if (timeout > 0) { /* did we timeout already? */
now = gras_os_time();
+ DEBUG2("wakeup=%f now=%f",wakeup, now);
if (now == -1 || now >= wakeup) {
if (now == -1 || now >= wakeup) {
- done = 0; /* didn't find anything */
- break;
+ /* didn't find anything */
+ THROW1(timeout_error,0,
+ "Timeout (%f) elapsed with selecting for incomming connexions",
+ timeout);
}
}
}
}
@@
-88,10
+86,10
@@
gras_trp_select(double timeout,
if (timeout > 0) {
DEBUG1("No socket to select onto. Sleep %f sec instead.",timeout);
gras_os_sleep(timeout);
if (timeout > 0) {
DEBUG1("No socket to select onto. Sleep %f sec instead.",timeout);
gras_os_sleep(timeout);
-
return timeout_error
;
+
THROW1(timeout_error,0,"No socket to select onto. Sleep %f sec instead",timeout)
;
} else {
DEBUG0("No socket to select onto. Return directly.");
} else {
DEBUG0("No socket to select onto. Return directly.");
-
return timeout_error
;
+
THROW0(timeout_error,0, "No socket to select onto. Return directly.")
;
}
}
}
}
@@
-109,8
+107,8
@@
gras_trp_select(double timeout,
if (timeout > 0) {
/* set the timeout */
if (timeout > 0) {
/* set the timeout */
- tout.tv_sec = (unsigned long)(
(wakeup - now)/1000000
);
- tout.tv_usec = (
unsigned long)(wakeup - now) %
1000000;
+ tout.tv_sec = (unsigned long)(
wakeup - now
);
+ tout.tv_usec = (
(wakeup -now) - ((unsigned long)(wakeup - now))) *
1000000;
p_tout = &tout;
} else if (timeout == 0) {
/* polling only */
p_tout = &tout;
} else if (timeout == 0) {
/* polling only */
@@
-124,23
+122,24
@@
gras_trp_select(double timeout,
p_tout = NULL;
}
p_tout = NULL;
}
- DEBUG
1("Selecting over %d socket(s)", max_fds-1
);
+ DEBUG
2("Selecting over %d socket(s); timeout=%f", max_fds-1,timeout
);
ready = select(max_fds, &FDS, NULL, NULL, p_tout);
ready = select(max_fds, &FDS, NULL, NULL, p_tout);
+ DEBUG1("select returned %d", ready);
if (ready == -1) {
switch (errno) {
case EINTR: /* a signal we don't care about occured. we don't care */
/* if we cared, we would have set an handler */
continue;
case EINVAL: /* invalid value */
if (ready == -1) {
switch (errno) {
case EINTR: /* a signal we don't care about occured. we don't care */
/* if we cared, we would have set an handler */
continue;
case EINVAL: /* invalid value */
-
RAISE3(system_error
,"invalid select: nb fds: %d, timeout: %d.%d",
+
THROW3(system_error,EINVAL
,"invalid select: nb fds: %d, timeout: %d.%d",
max_fds, (int)tout.tv_sec,(int) tout.tv_usec);
case ENOMEM:
xbt_assert0(0,"Malloc error during the select");
default:
max_fds, (int)tout.tv_sec,(int) tout.tv_usec);
case ENOMEM:
xbt_assert0(0,"Malloc error during the select");
default:
-
RAISE2(system_error
,"Error during select: %s (%d)",
+
THROW2(system_error,errno
,"Error during select: %s (%d)",
strerror(errno),errno);
}
strerror(errno),errno);
}
-
RAISE
_IMPOSSIBLE;
+
THROW
_IMPOSSIBLE;
} else if (ready == 0) {
continue; /* this was a timeout */
}
} else if (ready == 0) {
continue; /* this was a timeout */
}
@@
-158,12
+157,11
@@
gras_trp_select(double timeout,
/* not a socket but an ear. accept on it and serve next socket */
gras_socket_t accepted=NULL;
/* not a socket but an ear. accept on it and serve next socket */
gras_socket_t accepted=NULL;
-
TRY((sock_iter->plugin->socket_accept)(sock_iter,&accepted)
);
+
accepted = (sock_iter->plugin->socket_accept)(sock_iter
);
DEBUG2("accepted=%p,&accepted=%p",accepted,&accepted);
accepted->meas = sock_iter->meas;
DEBUG2("accepted=%p,&accepted=%p",accepted,&accepted);
accepted->meas = sock_iter->meas;
- } else {
-#if 0
- FIXME: this fails of files. quite logical
+
+ } else if (sock_iter->recv_ok) {
/* Make sure the socket is still alive by reading the first byte */
char lookahead;
int recvd;
/* Make sure the socket is still alive by reading the first byte */
char lookahead;
int recvd;
@@
-172,22
+170,23
@@
gras_trp_select(double timeout,
if (recvd < 0) {
WARN2("socket %d failed: %s", sock_iter->sd, strerror(errno));
/* done with this socket */
if (recvd < 0) {
WARN2("socket %d failed: %s", sock_iter->sd, strerror(errno));
/* done with this socket */
- gras_socket_close(
&
sock_iter);
+ gras_socket_close(sock_iter);
cursor--;
} else if (recvd == 0) {
/* Connection reset (=closed) by peer. */
DEBUG1("Connection %d reset by peer", sock_iter->sd);
cursor--;
} else if (recvd == 0) {
/* Connection reset (=closed) by peer. */
DEBUG1("Connection %d reset by peer", sock_iter->sd);
- gras_socket_close(
&
sock_iter);
+ gras_socket_close(sock_iter);
cursor--;
} else {
cursor--;
} else {
-#endif
/* Got a suited socket ! */
/* Got a suited socket ! */
- *dst = sock_iter;
XBT_OUT;
XBT_OUT;
- return no_error;
-#if 0
+ return sock_iter;
}
}
-#endif
+
+ } else {
+ /* This is a file socket. Cannot recv() on it, but it must be alive */
+ XBT_OUT;
+ return sock_iter;
}
}
@@
-199,10
+198,10
@@
gras_trp_select(double timeout,
}
XBT_OUT;
}
XBT_OUT;
- return
timeout_error
;
+ return
NULL
;
}
}
-
xbt_error_t
gras_trp_sg_setup(gras_trp_plugin_t plug) {
-
return mismatch_error
;
+
void
gras_trp_sg_setup(gras_trp_plugin_t plug) {
+
THROW0(mismatch_error,0,"No SG transport on live platforms")
;
}
}