Keep up with last SIMIX modifications.

[simgrid.git] / src / gras / Transport / transport_plugin_sg.c

diff --git a/src/gras/Transport/transport_plugin_sg.c b/src/gras/Transport/transport_plugin_sg.c
index 86eb934..b3335b8 100644 (file)
--- a/src/gras/Transport/transport_plugin_sg.c
+++ b/src/gras/Transport/transport_plugin_sg.c
@@ -306,9 +306,8 @@ void gras_trp_sg_chunk_send_raw(gras_socket_t sock,
   act = SIMIX_action_communicate(SIMIX_host_self(), sock_data->to_host,
                                 name, size, -1);
   SIMIX_register_action_to_condition(act,sock_data->cond);
-  SIMIX_register_condition_to_action(act,sock_data->cond);
-
   SIMIX_cond_wait(sock_data->cond,sock_data->mutex);
+  SIMIX_unregister_action_to_condition(act,sock_data->cond);
   /* error treatmeant (FIXME)*/
 
   /* cleanup structures */
@@ -328,16 +327,11 @@ int gras_trp_sg_chunk_recv(gras_socket_t sock,
     (gras_msg_procdata_t)gras_libdata_by_name("gras_msg");
   gras_trp_procdata_t trp_proc =
     (gras_trp_procdata_t)gras_libdata_by_id(gras_trp_libdata_id);
-       xbt_ex_t e;
 
   xbt_assert0(sock->meas, 
            "SG chunk exchange shouldn't be used on non-measurement sockets");
-       TRY {
-               xbt_queue_shift_timed(trp_proc->meas_selectable_sockets,
+       xbt_queue_shift_timed(trp_proc->meas_selectable_sockets,
                                                                                &remote_socket, 60);
-       } CATCH(e) {
-               RETHROW;
-       }
 
        if (remote_socket == NULL) {
     THROW0(timeout_error,0,"Timeout");