Gras listener thread of each process do select(-1) instead of while(1) {select(0.5)}

[simgrid.git] / src / gras / Msg / sg_msg.c

diff --git a/src/gras/Msg/sg_msg.c b/src/gras/Msg/sg_msg.c
index 6abe45c..7bda9a1 100644 (file)
--- a/src/gras/Msg/sg_msg.c
+++ b/src/gras/Msg/sg_msg.c
@@ -58,7 +58,11 @@ void gras_msg_send_ext(gras_socket_t   sock,
                                              payload,msg->payl);
   } else if (kind == e_gras_msg_kind_rpcanswer) {
     msg->payl_size=gras_datadesc_size(msgtype->answer_type);
-    msg->payl=xbt_malloc(msg->payl_size);
+    if (msg->payl_size)
+       msg->payl=xbt_malloc(msg->payl_size);
+    else
+       msg->payl=NULL;
+     
     if (msgtype->answer_type)
       whole_payload_size = gras_datadesc_memcpy(msgtype->answer_type,
                                                payload, msg->payl);
@@ -90,7 +94,6 @@ void gras_msg_send_ext(gras_socket_t   sock,
                                 sock_data->to_host,msgtype->name,
                                 (double)whole_payload_size, -1);
   SIMIX_register_action_to_condition(act,sock_data->cond);
-  SIMIX_register_condition_to_action(act,sock_data->cond);
   
   VERB5("Sending to %s(%s) a message type '%s' kind '%s' ID %lu",
        SIMIX_host_get_name(sock_data->to_host),
@@ -98,6 +101,7 @@ void gras_msg_send_ext(gras_socket_t   sock,
        msg->type->name,e_gras_msg_kind_names[msg->kind], msg->ID);
        
   SIMIX_cond_wait(sock_data->cond, sock_data->mutex);
+  SIMIX_unregister_action_to_condition(act,sock_data->cond);
   /* error treatmeant (FIXME)*/
 
   /* cleanup structures */