- gras_socket_t res;
- gras_trp_procdata_t pd = (gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id);
- gras_trp_sg_sock_data_t *sockdata;
- gras_trp_plugin_t trp;
- gras_socket_t active_socket;
- gras_socket_t sock_iter; /* iterating over all sockets */
- int cursor;
-
- DEBUG0("Trying to get the lock pd, trp_select");
- SIMIX_mutex_lock(pd->mutex);
- DEBUG3("select on %s@%s with timeout=%f",
- SIMIX_process_get_name(SIMIX_process_self()),
- SIMIX_host_get_name(SIMIX_host_self()),
- timeout);
-
- if (xbt_fifo_size(pd->active_socket) == 0) {
- /* message didn't arrive yet, wait */
- SIMIX_cond_wait_timeout(pd->cond,pd->mutex,timeout);
- }
-
- if (xbt_fifo_size(pd->active_socket) == 0) {
- DEBUG0("TIMEOUT");
- SIMIX_mutex_unlock(pd->mutex);
- THROW0(timeout_error,0,"Timeout");
- }
- active_socket = xbt_fifo_shift(pd->active_socket);
-
- /* 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) {
- DEBUG1("Consider %p as outgoing socket to expeditor",sock_iter);
-
- if (sock_iter->meas || !sock_iter->outgoing)
- continue;
- /*
- if ((sock_iter->peer_port == active_socket->port) &&
- (((gras_trp_sg_sock_data_t*)sock_iter->data)->to_host == SIMIX_process_get_host(((gras_trp_sg_sock_data_t*)active_socket->data)->from_process))) {
- */
- if ( (((gras_trp_sg_sock_data_t*)sock_iter->data)->to_socket == active_socket) && (((gras_trp_sg_sock_data_t*)sock_iter->data)->to_host == SIMIX_process_get_host(((gras_trp_sg_sock_data_t*)active_socket->data)->from_process)) ) {
- SIMIX_mutex_unlock(pd->mutex);
- return sock_iter;
- }
- }
-
- /* Socket to expeditor not created yet */
- DEBUG0("Create a socket to the expeditor");
-
- trp = gras_trp_plugin_get_by_name("sg");
-
- gras_trp_socket_new(1,&res);
- res->plugin = trp;
-
- res->incoming = 1;
- res->outgoing = 1;
- res->accepting = 0;
- res->sd = -1;
-
- res->port = -1;
-
- /* initialize the ports */
- //res->peer_port = active_socket->port;
- res->port = active_socket->peer_port;
-
- /* create sockdata */
- sockdata = xbt_new(gras_trp_sg_sock_data_t,1);
- sockdata->from_process = SIMIX_process_self();
- sockdata->to_process = ((gras_trp_sg_sock_data_t*)(active_socket->data))->from_process;
+ gras_socket_t res;
+ gras_trp_procdata_t pd =
+ (gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id);
+ gras_trp_sg_sock_data_t *sockdata;
+ gras_trp_plugin_t trp;
+ gras_socket_t active_socket;
+ gras_trp_sg_sock_data_t *active_socket_data;
+ gras_socket_t sock_iter; /* iterating over all sockets */
+ int cursor;
+
+ DEBUG0("Trying to get the lock pd, trp_select");
+ SIMIX_mutex_lock(pd->msg_select_mutex);
+ DEBUG3("select on %s@%s with timeout=%f",
+ SIMIX_process_get_name(SIMIX_process_self()),
+ SIMIX_host_get_name(SIMIX_host_self()),
+ timeout);
+
+ if (xbt_fifo_size(pd->msg_selectable_sockets) == 0) {
+ /* message didn't arrive yet, wait */
+ SIMIX_cond_wait_timeout(pd->msg_select_cond,pd->msg_select_mutex,timeout);
+ }
+
+ if (xbt_fifo_size(pd->msg_selectable_sockets) == 0) {
+ DEBUG0("TIMEOUT");
+ SIMIX_mutex_unlock(pd->msg_select_mutex);
+ THROW0(timeout_error,0,"Timeout");
+ }
+ active_socket = xbt_fifo_shift(pd->msg_selectable_sockets);
+ 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)) ) {
+ SIMIX_mutex_unlock(pd->msg_select_mutex);
+ return sock_iter;
+ }
+ }
+
+ /* Socket to expeditor not created yet */
+ DEBUG0("Create a socket to the expeditor");
+
+ trp = gras_trp_plugin_get_by_name("sg");
+
+ gras_trp_socket_new(1,&res);
+ res->plugin = trp;
+
+ res->incoming = 1;
+ res->outgoing = 1;
+ res->accepting = 0;
+ res->sd = -1;
+
+ res->port = -1;
+
+ /* initialize the ports */
+ //res->peer_port = active_socket->port;
+ res->port = active_socket->peer_port;
+
+ /* create sockdata */
+ sockdata = xbt_new(gras_trp_sg_sock_data_t,1);
+ sockdata->from_process = SIMIX_process_self();
+ sockdata->to_process = active_socket_data->from_process;
