X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bc6d7585229ccb9b293a722a3fa9691f3ce16360..976d2dfcc90c46c5acba3e310e0125d9a061c381:/teshsuite/msg/get_sender.c?ds=sidebyside

diff --git a/teshsuite/msg/get_sender.c b/teshsuite/msg/get_sender.c
index 308d41dcbe..6a766c518d 100644
--- a/teshsuite/msg/get_sender.c
+++ b/teshsuite/msg/get_sender.c
@@ -1,34 +1,42 @@
+/* Copyright (c) 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
 #include <stdio.h>
 #include "msg/msg.h"
 #include <float.h>
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(test,"Messages specific to this example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Messages specific to this example");
 
 
-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);
-  MSG_process_sleep(1.); /* FIXME: if the sender exits before the receiver calls get_sender(), bad thing happens */
-  INFO0("Exiting");
+static int send(int argc, char *argv[])
+{
+  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 */
+  XBT_INFO("Exiting");
   return 0;
 }
 
-static int receive(int argc, char *argv[]) {
-  INFO0("Receiving");
+static int receive(int argc, char *argv[])
+{
+  XBT_INFO("Receiving");
   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_process_get_name(MSG_task_get_sender(task)));
+  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;
 }
 
 /** Main function */
-int main(int argc, char *argv[]) {
+int main(int argc, char *argv[])
+{
   MSG_error_t res = MSG_OK;
 
-  MSG_global_init(&argc,argv);
-  MSG_set_channel_number(100);
+  MSG_global_init(&argc, argv);
 
   /*   Application deployment */
   MSG_function_register("send", &send);
@@ -38,7 +46,8 @@ int main(int argc, char *argv[]) {
   MSG_launch_application(argv[1]);
   res = MSG_main();
   MSG_clean();
-  if(res==MSG_OK) return 0;
-  else return 1;
+  if (res == MSG_OK)
+    return 0;
+  else
+    return 1;
 }
-