Fix ns3.

[simgrid.git] / teshsuite / msg / get_sender.c

diff --git a/teshsuite/msg/get_sender.c b/teshsuite/msg/get_sender.c
index 1441932..6a766c5 100644 (file)
--- a/teshsuite/msg/get_sender.c
+++ b/teshsuite/msg/get_sender.c
@@ -13,20 +13,20 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Messages specific to this example");
 
 static int send(int argc, char *argv[])
 {
 
 static int send(int argc, char *argv[])
 {

-  INFO0("Sending");
-  MSG_task_put(MSG_task_create("Blah", 0.0, 0.0, NULL), MSG_host_self(), 0);
+  XBT_INFO("Sending");
+  MSG_task_send(MSG_task_create("Blah", 0.0, 0.0, NULL), MSG_host_get_name(MSG_host_self()));

   MSG_process_sleep(1.);        /* FIXME: if the sender exits before the receiver calls get_sender(), bad thing happens */
   MSG_process_sleep(1.);        /* FIXME: if the sender exits before the receiver calls get_sender(), bad thing happens */

-  INFO0("Exiting");
+  XBT_INFO("Exiting");

   return 0;
 }
 
 static int receive(int argc, char *argv[])
 {
   return 0;
 }
 
 static int receive(int argc, char *argv[])
 {

-  INFO0("Receiving");
+  XBT_INFO("Receiving");

   m_task_t task = NULL;
   m_task_t task = NULL;

-  MSG_task_get_with_timeout(&task, 0, DBL_MAX);
-  xbt_assert0(MSG_task_get_sender(task), "No sender received");
-  INFO1("Got a message sent by '%s'",
+  MSG_task_receive_with_timeout(&task, MSG_host_get_name(MSG_host_self()), DBL_MAX);
+  xbt_assert(MSG_task_get_sender(task), "No sender received");
+  XBT_INFO("Got a message sent by '%s'",

         MSG_process_get_name(MSG_task_get_sender(task)));
   return 0;
 }
         MSG_process_get_name(MSG_task_get_sender(task)));
   return 0;
 }


@@ -37,7 +37,6 @@ int main(int argc, char *argv[])
   MSG_error_t res = MSG_OK;
 
   MSG_global_init(&argc, argv);
   MSG_error_t res = MSG_OK;
 
   MSG_global_init(&argc, argv);

-  MSG_set_channel_number(100);

 
   /*   Application deployment */
   MSG_function_register("send", &send);
 
   /*   Application deployment */
   MSG_function_register("send", &send);