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
Sanitize the log channels naming scheme in GRAS too
[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
4810f8c
..
0a702e2
100644
(file)
--- a/
src/gras/Transport/rl_transport.c
+++ b/
src/gras/Transport/rl_transport.c
@@
-10,8
+10,7
@@
#include "xbt/ex.h"
#include "portable.h"
#include "gras/Transport/transport_private.h"
#include "xbt/ex.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:
@@
-58,9
+57,12
@@
gras_socket_t gras_trp_select(double timeout) {
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);
}
}
}
}
@@
-105,8
+107,8
@@
gras_socket_t 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 */
@@
-120,8
+122,9
@@
gras_socket_t 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 (ready == -1) {
switch (errno) {
case EINTR: /* a signal we don't care about occured. we don't care */