/* 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"
XBT_LOG_EXTERNAL_CATEGORY(transport);
/**
* 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 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() + 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; */
# endif /* !USE_SYSCONF */
#endif
- *dst=NULL;
while (done == -1) {
if (timeout > 0) { /* did we timeout already? */
now = gras_os_time();
/* construct the set of socket to ear from */
FD_ZERO(&FDS);
- max_fds = 0;
+ max_fds = -1;
xbt_dynar_foreach(sockets,cursor,sock_iter) {
if (sock_iter->incoming) {
DEBUG1("Considering socket %d for select",sock_iter->sd);
}
}
- if (max_fds == 0) {
+ if (max_fds == -1) {
if (timeout > 0) {
- DEBUG0("No socket to select onto. Sleep instead.");
- gras_os_sleep(timeout,0);
- return timeout_error;
+ DEBUG1("No socket to select onto. Sleep %f sec instead.",timeout);
+ gras_os_sleep(timeout);
+ THROW1(timeout_error,0,"No socket to select onto. Sleep %f sec instead",timeout);
} else {
DEBUG0("No socket to select onto. Return directly.");
- return timeout_error;
+ THROW0(timeout_error,0, "No socket to select onto. Return directly.");
}
}
/* 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:
- RAISE2(system_error,"Error during select: %s (%d)",
+ THROW2(system_error,errno,"Error during select: %s (%d)",
strerror(errno),errno);
}
- RAISE_IMPOSSIBLE;
+ THROW_IMPOSSIBLE;
} else if (ready == 0) {
continue; /* this was a timeout */
}
/* not a socket but an ear. accept on it and serve next socket */
gras_socket_t accepted=NULL;
+ accepted = (sock_iter->plugin->socket_accept)(sock_iter);
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 {
#endif
/* Got a suited socket ! */
- *dst = sock_iter;
XBT_OUT;
- return no_error;
+ return sock_iter;
#if 0
}
#endif
}
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");
}