- /* Socket to expeditor not created yet */
- DEBUG0("Create a socket to the expeditor");
-
- TRY(gras_trp_plugin_get_by_name("buf",&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 = gras_new(gras_trp_sg_sock_data_t,1)))
- RAISE_MALLOC;
-
- sockdata->from_PID = MSG_process_self_PID();
- sockdata->to_PID = r_pid;
- sockdata->to_host = MSG_process_get_host(MSG_process_from_PID(r_pid));
- (*dst)->data = sockdata;
- gras_trp_buf_init_sock(*dst);
-
- (*dst)->peer_name = strdup(MSG_host_get_name(sockdata->to_host));
-
- remote_hd=(gras_hostdata_t *)MSG_host_get_data(sockdata->to_host);
- gras_assert0(remote_hd,"Run gras_process_init!!");
-
- sockdata->to_chan = -1;
- (*dst)->peer_port = -10;
- for (cursor=0; cursor<GRAS_MAX_CHANNEL; cursor++) {
- if (remote_hd->proc[cursor] == r_pid) {
- sockdata->to_chan = cursor;
- DEBUG2("Chan %d on %s is for my pal",
- cursor,(*dst)->peer_name);
-
- gras_dynar_foreach(remote_hd->ports, cpt, pr) {
- if (sockdata->to_chan == pr.tochan) {
- if (pr.raw) {
- DEBUG0("Damn, it's raw");
- continue;
- }
-
- (*dst)->peer_port = pr.port;
- DEBUG1("Cool, it points to port %d", pr.port);
- break;
- } else {
- DEBUG2("Wrong port (tochan=%d, looking for %d)\n",
- pr.tochan,sockdata->to_chan);
- }
- }
- if ((*dst)->peer_port == -10) {
- /* was raw */
- sockdata->to_chan = -1;
- } else {
- /* found it, don't let it override by raw */
- break;
+ MSG_channel_select_from((m_channel_t) pd->chan, timeout, &r_pid);
+
+ if (r_pid < 0) {
+ DEBUG0("TIMEOUT");
+ THROW0(timeout_error,0,"Timeout");
+ }
+
+ /* Ok, got something. Open a socket back to the expeditor */
+
+ /* Try to reuse an already openned socket to that expeditor */
+ 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;
+
+ sockdata = sock_iter->data;
+ if (sockdata->to_PID == r_pid) {
+ 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;
+
+ sockdata = xbt_new(gras_trp_sg_sock_data_t,1);
+ sockdata->from_PID = MSG_process_self_PID();
+ sockdata->to_PID = r_pid;
+ sockdata->to_host = MSG_process_get_host(MSG_process_from_PID(r_pid));
+ res->data = sockdata;
+ gras_trp_buf_init_sock(res);
+
+ res->peer_name = strdup(MSG_host_get_name(sockdata->to_host));
+
+ remote_hd=(gras_hostdata_t *)MSG_host_get_data(sockdata->to_host);
+ xbt_assert0(remote_hd,"Run gras_process_init!!");
+
+ sockdata->to_chan = -1;
+ res->peer_port = -10;
+ for (cursor=0; cursor<XBT_MAX_CHANNEL; cursor++) {
+ if (remote_hd->proc[cursor] == r_pid) {
+ sockdata->to_chan = cursor;
+ DEBUG2("Chan %d on %s is for my pal",
+ cursor,res->peer_name);
+
+ xbt_dynar_foreach(remote_hd->ports, cpt, pr) {
+ if (sockdata->to_chan == pr.tochan) {
+ if (pr.meas) {
+ DEBUG0("Damn, it's for measurement");
+ continue;