- gras_trp_plugin_t *trp;
-
- gras_socket_t *sock_iter; /* iterating over all sockets */
- int cursor; /* iterating over all sockets */
-
- int r_pid, cpt;
- gras_hostdata_t *remote_hd;
-
- DEBUG1("select with timeout=%d",timeout);
- do {
- r_pid = MSG_task_probe_from((m_channel_t) pd->chan);
- if (r_pid >= 0) {
- /* Try to reuse an already openned socket to that expeditor */
- gras_dynar_foreach(pd->sockets,cursor,sock_iter) {
- DEBUG1("Consider %p as outgoing socket to expeditor",sock_iter);
- sockdata = sock_iter->data;
-
- if (sock_iter->raw || !sock_iter->outgoing)
- continue;
-
- if (sockdata->from_PID == r_pid) {
- *dst=sock_iter;
- return no_error;
- }
- }
-
- /* Socket to expeditor not created yet */
- DEBUG0("Create a socket to the expeditor");
-
- TRY(gras_trp_plugin_get_by_name("sg",&trp));
-
- TRY(gras_trp_socket_new(1,dst));
- (*dst)->plugin = trp;
-
- (*dst)->incoming = 1;
- (*dst)->outgoing = 1;
- (*dst)->accepting = 0;
- (*dst)->sd = -1;
-
- (*dst)->port = -1;
-
- if (!(sockdata = malloc(sizeof(gras_trp_sg_sock_data_t))))
- RAISE_MALLOC;
-
- sockdata->from_PID = r_pid;
- sockdata->to_PID = MSG_process_self_PID();
- sockdata->to_host = MSG_process_get_host(MSG_process_from_PID(r_pid));
- (*dst)->data = sockdata;
+ gras_trp_plugin_t trp;
+ gras_socket_t active_socket = NULL;
+ gras_trp_sg_sock_data_t *active_socket_data;
+ gras_socket_t sock_iter; /* iterating over all sockets */
+ int cursor;
+
+ DEBUG3("select on %s@%s with timeout=%f",
+ SIMIX_process_get_name(SIMIX_process_self()),
+ SIMIX_host_get_name(SIMIX_host_self()),
+ timeout);
+ if (timeout>=0) {
+ xbt_queue_shift_timed(pd->msg_selectable_sockets,
+ &active_socket, timeout);
+ } else {
+ xbt_queue_shift(pd->msg_selectable_sockets, &active_socket);
+ }
+
+ if (active_socket == NULL) {
+ DEBUG0("TIMEOUT");
+ THROW0(timeout_error,0,"Timeout");
+ }
+ active_socket_data = (gras_trp_sg_sock_data_t*)active_socket->data;
+
+ /* Ok, got something. Open a socket back to the expeditor */
+
+ /* Try to reuse an already openned socket to that expeditor */
+ DEBUG1("Open sockets size %lu",xbt_dynar_length(pd->sockets));
+ xbt_dynar_foreach(pd->sockets,cursor,sock_iter) {
+ gras_trp_sg_sock_data_t *sock_data;
+ DEBUG1("Consider %p as outgoing socket to expeditor",sock_iter);
+
+ if (sock_iter->meas || !sock_iter->outgoing)
+ continue;
+ sock_data = ((gras_trp_sg_sock_data_t*)sock_iter->data);
+
+ if ( (sock_data->to_socket == active_socket) &&
+ (sock_data->to_host == SIMIX_process_get_host(active_socket_data->from_process)) ) {
+ xbt_dynar_cursor_unlock(pd->sockets);
+ return sock_iter;
+ }
+ }