malloc(0) fails on AIX

[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 2a9c84a..7bda9a1 100644 (file)
--- a/src/gras/Msg/sg_msg.c
+++ b/src/gras/Msg/sg_msg.c
@@ -44,10 +44,6 @@ void gras_msg_send_ext(gras_socket_t   sock,
   xbt_assert1(!gras_socket_is_meas(sock), 
              "Asked to send a message on the measurement socket %p", sock);
        
-       /* got the mutex my port */
-       DEBUG1("Sock port %d",sock->port);
-       SIMIX_mutex_lock(sock_data->mutex);
-
        /*initialize gras message */
        msg = xbt_new(s_gras_msg_t,1);
        msg->expe = sock;
@@ -58,32 +54,36 @@ void gras_msg_send_ext(gras_socket_t   sock,
      /* error on remote host, carfull, payload is an exception */
     msg->payl_size=gras_datadesc_size(gras_datadesc_by_name("ex_t"));
     msg->payl=xbt_malloc(msg->payl_size);
-    whole_payload_size = gras_datadesc_copy(gras_datadesc_by_name("ex_t"),
-                                           payload,msg->payl);
+    whole_payload_size = gras_datadesc_memcpy(gras_datadesc_by_name("ex_t"),
+                                             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_copy(msgtype->answer_type,
-                                             payload, msg->payl);
+      whole_payload_size = gras_datadesc_memcpy(msgtype->answer_type,
+                                               payload, msg->payl);
   } else {
     msg->payl_size=gras_datadesc_size(msgtype->ctn_type);
     msg->payl=msg->payl_size?xbt_malloc(msg->payl_size):NULL;
     if (msgtype->ctn_type)
-      whole_payload_size = gras_datadesc_copy(msgtype->ctn_type,
-                                             payload, msg->payl);
+      whole_payload_size = gras_datadesc_memcpy(msgtype->ctn_type,
+                                               payload, msg->payl);
   }
-  /* put message on msg_queue */
-  msg_remote_proc = (gras_msg_procdata_t)
-    gras_libdata_by_name_from_remote("gras_msg",sock_data->to_process);
-  xbt_fifo_push(msg_remote_proc->msg_to_receive_queue,msg);
-  
-  /* wake-up the receiver */
+
+       /* put the selectable socket on the queue */
   trp_remote_proc = (gras_trp_procdata_t)
     gras_libdata_by_name_from_remote("gras_trp",sock_data->to_process);
 
-  xbt_fifo_push(trp_remote_proc->msg_selectable_sockets,sock);  
-  SIMIX_cond_signal(trp_remote_proc->msg_select_cond);
+  xbt_queue_push(trp_remote_proc->msg_selectable_sockets,&sock);  
+
+  /* put message on msg_queue */
+       msg_remote_proc = (gras_msg_procdata_t)
+               gras_libdata_by_name_from_remote("gras_msg",sock_data->to_process);
+       xbt_fifo_push(msg_remote_proc->msg_to_receive_queue,msg);
   
   /* wait for the receiver */
   SIMIX_cond_wait(sock_data->cond, sock_data->mutex);
@@ -94,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),
@@ -102,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 */