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
dead code
[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 e9eba7e285e1ae49e029995c753be370626f125b..886cbe6ae713b4ddeb86f7545d5cd46d58afa8e5 100644
(file)
--- a/
src/gras/Transport/rl_transport.c
+++ b/
src/gras/Transport/rl_transport.c
@@
-15,7
+15,7
@@
XBT_LOG_DEFAULT_CATEGORY(transport);
/**
* gras_trp_select:
*
/**
* gras_trp_select:
*
- * Returns the next socket to service
having a message awaiting
.
+ * Returns the next socket to service
because it receives a message
.
*
* if timeout<0, we ought to implement the adaptative timeout (FIXME)
*
*
* if timeout<0, we ought to implement the adaptative timeout (FIXME)
*
@@
-30,7
+30,7
@@
gras_trp_select(double timeout,
xbt_error_t errcode;
xbt_dynar_t sockets= gras_socketset_get();
int done = -1;
xbt_error_t errcode;
xbt_dynar_t sockets= gras_socketset_get();
int done = -1;
- double wakeup = gras_os_time() +
1000000*
timeout;
+ double wakeup = gras_os_time() + timeout;
double now = 0;
/* nextToService used to make sure socket with high number do not starve */
/* static int nextToService = 0; */
double now = 0;
/* nextToService used to make sure socket with high number do not starve */
/* static int nextToService = 0; */
@@
-86,8
+86,8
@@
gras_trp_select(double timeout,
if (max_fds == -1) {
if (timeout > 0) {
if (max_fds == -1) {
if (timeout > 0) {
- DEBUG
0("No socket to select onto. Sleep instead."
);
- gras_os_sleep(timeout
,0
);
+ DEBUG
1("No socket to select onto. Sleep %f sec instead.",timeout
);
+ gras_os_sleep(timeout);
return timeout_error;
} else {
DEBUG0("No socket to select onto. Return directly.");
return timeout_error;
} else {
DEBUG0("No socket to select onto. Return directly.");
@@
-160,7
+160,7
@@
gras_trp_select(double timeout,
DEBUG2("accepted=%p,&accepted=%p",accepted,&accepted);
TRY((sock_iter->plugin->socket_accept)(sock_iter,&accepted));
DEBUG2("accepted=%p,&accepted=%p",accepted,&accepted);
TRY((sock_iter->plugin->socket_accept)(sock_iter,&accepted));
- accepted->
raw = sock_iter->raw
;
+ accepted->
meas = sock_iter->meas
;
} else {
#if 0
FIXME: this fails of files. quite logical
} else {
#if 0
FIXME: this fails of files. quite logical