update surf doc to kill some more doc warnings

[simgrid.git] / examples / msg / alias / masterslave_forwarder_with_alias.c

diff --git a/examples/msg/alias/masterslave_forwarder_with_alias.c b/examples/msg/alias/masterslave_forwarder_with_alias.c
index 4258bfb..050cfd9 100644 (file)
--- a/examples/msg/alias/masterslave_forwarder_with_alias.c
+++ b/examples/msg/alias/masterslave_forwarder_with_alias.c
@@ -14,12 +14,6 @@
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
                              "Messages specific for this msg example");
 
-
-typedef enum {
-  PORT_22 = 0,
-  MAX_CHANNEL
-} channel_t;
-
 int master(int argc, char *argv[]);
 int slave(int argc, char *argv[]);
 int forwarder(int argc, char *argv[]);
@@ -38,16 +32,15 @@ int master(int argc, char *argv[])
   int number_of_tasks = 0;
   double task_comp_size = 0;
   double task_comm_size = 0;
-
-
   int i;
+  int read;
 
-  xbt_assert1(sscanf(argv[1], "%d", &number_of_tasks),
-              "Invalid argument %s\n", argv[1]);
-  xbt_assert1(sscanf(argv[2], "%lg", &task_comp_size),
-              "Invalid argument %s\n", argv[2]);
-  xbt_assert1(sscanf(argv[3], "%lg", &task_comm_size),
-              "Invalid argument %s\n", argv[3]);
+  read = sscanf(argv[1], "%d", &number_of_tasks);
+  xbt_assert(read, "Invalid argument %s\n", argv[1]);
+  read = sscanf(argv[2], "%lg", &task_comp_size);
+  xbt_assert(read, "Invalid argument %s\n", argv[2]);
+  read = sscanf(argv[3], "%lg", &task_comm_size);
+  xbt_assert(read, "Invalid argument %s\n", argv[3]);
 
   {
     /*  Task creation */
@@ -73,32 +66,32 @@ int master(int argc, char *argv[])
     }
   }
 
-  INFO2("Got %d aliases and %d tasks to process", alias_count,
+  XBT_INFO("Got %d aliases and %d tasks to process", alias_count,
         number_of_tasks);
 
   for (i = 0; i < alias_count; i++)
-    DEBUG1("%s", aliases[i]);
+    XBT_DEBUG("%s", aliases[i]);
 
   for (i = 0; i < number_of_tasks; i++) {
-    INFO2("Sending \"%s\" to \"%s\"", todo[i]->name,
+    XBT_INFO("Sending \"%s\" to \"%s\"", todo[i]->name,
           aliases[i % alias_count]);
 
     if (!strcmp
         (MSG_host_get_name(MSG_host_self()), aliases[i % alias_count])) {
-      INFO0("Hey ! It's me ! :)");
+      XBT_INFO("Hey ! It's me ! :)");
     }
 
     MSG_task_send(todo[i], aliases[i % alias_count]);
-    INFO0("Sent");
+    XBT_INFO("Sent");
   }
 
-  INFO0
+  XBT_INFO
       ("All tasks have been dispatched. Let's tell everybody the computation is over.");
 
   for (i = 0; i < alias_count; i++)
     MSG_task_send(MSG_task_create("finalize", 0, 0, FINALIZE), aliases[i]);
 
-  INFO0("Goodbye now!");
+  XBT_INFO("Goodbye now!");
 
   for (i = 0; i < alias_count; i++)
     free(aliases[i]);
@@ -116,23 +109,23 @@ int slave(int argc, char *argv[])
 
   while (1) {
     res = MSG_task_receive(&(task), MSG_host_get_name(MSG_host_self()));
-    xbt_assert0(res == MSG_OK, "MSG_task_receive failed");
+    xbt_assert(res == MSG_OK, "MSG_task_receive failed");
 
-    INFO1("Received \"%s\"", MSG_task_get_name(task));
+    XBT_INFO("Received \"%s\"", MSG_task_get_name(task));
 
     if (!strcmp(MSG_task_get_name(task), "finalize")) {
       MSG_task_destroy(task);
       break;
     }
 
-    INFO1("Processing \"%s\"", MSG_task_get_name(task));
+    XBT_INFO("Processing \"%s\"", MSG_task_get_name(task));
     MSG_task_execute(task);
-    INFO1("\"%s\" done", MSG_task_get_name(task));
+    XBT_INFO("\"%s\" done", MSG_task_get_name(task));
     MSG_task_destroy(task);
     task = NULL;
   }
 
-  INFO0("I'm done. See you!");
+  XBT_INFO("I'm done. See you!");
   return 0;
 }                               /* end_of_slave */
 
@@ -160,10 +153,10 @@ int forwarder(int argc, char *argv[])
     a = MSG_task_receive(&(task), MSG_host_get_name(MSG_host_self()));
 
     if (a == MSG_OK) {
-      INFO1("Received \"%s\"", MSG_task_get_name(task));
+      XBT_INFO("Received \"%s\"", MSG_task_get_name(task));
 
       if (MSG_task_get_data(task) == FINALIZE) {
-        INFO0
+        XBT_INFO
             ("All tasks have been dispatched. Let's tell everybody the computation is over.");
 
         for (i = 0; i < alias_count; i++)
@@ -174,20 +167,20 @@ int forwarder(int argc, char *argv[])
         break;
       }
 
-      INFO2("Sending \"%s\" to \"%s\"", MSG_task_get_name(task),
+      XBT_INFO("Sending \"%s\" to \"%s\"", MSG_task_get_name(task),
             aliases[i % alias_count]);
       MSG_task_send(task, aliases[i % alias_count]);
       i++;
     } else {
-      INFO0("Hey ?! What's up ? ");
-      xbt_assert0(0, "Unexpected behavior");
+      XBT_INFO("Hey ?! What's up ? ");
+      xbt_die( "Unexpected behavior");
     }
   }
 
   for (i = 0; i < alias_count; i++)
     free(aliases[i]);
 
-  INFO0("I'm done. See you!");
+  XBT_INFO("I'm done. See you!");
   return 0;
 
 }                               /* end_of_forwarder */
@@ -199,7 +192,6 @@ MSG_error_t test_all(const char *platform_file,
   MSG_error_t res = MSG_OK;
 
   {                             /*  Simulation setting */
-    MSG_set_channel_number(MAX_CHANNEL);
     MSG_paje_output("msg_test.trace");
     MSG_create_environment(platform_file);
   }
@@ -214,7 +206,7 @@ MSG_error_t test_all(const char *platform_file,
 
   res = MSG_main();
 
-  INFO1("Simulation time %g", MSG_get_clock());
+  XBT_INFO("Simulation time %g", MSG_get_clock());
   return res;
 }                               /* end_of_test_all */