[trace] Fix tests: tracing-ms, and tracing-categories.

[simgrid.git] / examples / msg / masterslave / masterslave_console.c

diff --git a/examples/msg/masterslave/masterslave_console.c b/examples/msg/masterslave/masterslave_console.c
index fa5543b..fc1b757 100644 (file)
--- a/examples/msg/masterslave/masterslave_console.c
+++ b/examples/msg/masterslave/masterslave_console.c
@@ -16,7 +16,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
 
 int master(int argc, char *argv[]);
 int slave(int argc, char *argv[]);
-MSG_error_t test_all(const char*);
+MSG_error_t test_all(const char *);
 
 typedef enum {
   PORT_22 = 0,
@@ -26,37 +26,42 @@ typedef enum {
 /** Emitter function  */
 int master(int argc, char *argv[])
 {
-       long number_of_tasks = atol(argv[1]);
-       double task_comp_size = atof(argv[2]);
-       double task_comm_size = atof(argv[3]);
-       long slaves_count = atol(argv[4]);
-    int i;
-
-    INFO2("Got %ld slaves and %ld tasks to process", slaves_count,number_of_tasks);
-       for (i = 0; i < number_of_tasks; i++) {
-       char mailbox[256];
-       char sprintf_buffer[256];
-       m_task_t task=NULL;
-
-    sprintf(mailbox,"slave-%ld",i % slaves_count);
-       sprintf(sprintf_buffer, "Task_%d", i);
-       task = MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size, NULL);
-       if (number_of_tasks<10000 || i%10000 == 0)
-           INFO3("Sending \"%s\" (of %ld) to mailbox \"%s\"", task->name, number_of_tasks, mailbox);
-           MSG_task_send(task, mailbox);
-         }
-
-       INFO0("All tasks have been dispatched. Let's tell everybody the computation is over.");
-       for (i = 0; i < slaves_count; i++) {
-       char mailbox[80];
-
-       sprintf(mailbox,"slave-%ld",i % slaves_count);
-       m_task_t finalize = MSG_task_create ("finalize", 0, 0, 0);
-       MSG_task_send(finalize, mailbox);
-         }
-
-    INFO0("Goodbye now!");
-       return 0;
+  long number_of_tasks = atol(argv[1]);
+  double task_comp_size = atof(argv[2]);
+  double task_comm_size = atof(argv[3]);
+  long slaves_count = atol(argv[4]);
+  int i;
+
+  XBT_INFO("Got %ld slaves and %ld tasks to process", slaves_count,
+        number_of_tasks);
+  for (i = 0; i < number_of_tasks; i++) {
+    char mailbox[256];
+    char sprintf_buffer[256];
+    m_task_t task = NULL;
+
+    sprintf(mailbox, "slave-%ld", i % slaves_count);
+    sprintf(sprintf_buffer, "Task_%d", i);
+    task =
+        MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size,
+                        NULL);
+    if (number_of_tasks < 10000 || i % 10000 == 0)
+      XBT_INFO("Sending \"%s\" (of %ld) to mailbox \"%s\"", task->name,
+            number_of_tasks, mailbox);
+    MSG_task_send(task, mailbox);
+  }
+
+  XBT_INFO
+      ("All tasks have been dispatched. Let's tell everybody the computation is over.");
+  for (i = 0; i < slaves_count; i++) {
+    char mailbox[80];
+
+    sprintf(mailbox, "slave-%ld", i % slaves_count);
+    m_task_t finalize = MSG_task_create("finalize", 0, 0, 0);
+    MSG_task_send(finalize, mailbox);
+  }
+
+  XBT_INFO("Goodbye now!");
+  return 0;
 }                               /* end_of_master */
 
 /** Receiver function  */
@@ -66,34 +71,35 @@ int slave(int argc, char *argv[])
   int res;
   int id = -1;
   char mailbox[80];
+  int read;
 
-  xbt_assert1(sscanf(argv[1],"%d", &id),
-        "Invalid argument %s\n",argv[1]);
+  read = sscanf(argv[1], "%d", &id);
+  xbt_assert(read, "Invalid argument %s\n", argv[1]);
 
-  sprintf(mailbox,"slave-%d",id);
+  sprintf(mailbox, "slave-%d", id);
 
-  while(1) {
+  while (1) {
     res = MSG_task_receive(&(task), mailbox);
-    xbt_assert0(res == MSG_OK, "MSG_task_get failed");
+    xbt_assert(res == MSG_OK, "MSG_task_get failed");
 
-    INFO1("Received \"%s\"", MSG_task_get_name(task));
-    if (!strcmp(MSG_task_get_name(task),"finalize")) {
-       MSG_task_destroy(task);
-       break;
+    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 */
+}                               /* end_of_slave */
 
 /** Test function */
-MSG_error_t test_all(const char *file)//(void)
+MSG_error_t test_all(const char *file)  //(void)
 {
   MSG_error_t res = MSG_OK;
   /*  Simulation setting */
@@ -105,7 +111,7 @@ MSG_error_t test_all(const char *file)//(void)
 
   res = MSG_main();
 
-  INFO1("Simulation time %g", MSG_get_clock());
+  XBT_INFO("Simulation time %g", MSG_get_clock());
   return res;
 }                               /* end_of_test_all */
 
@@ -116,9 +122,9 @@ int main(int argc, char *argv[])
 
   MSG_global_init(&argc, argv);
   if (argc < 2) {
-     printf ("Usage: %s platform_script[.lua]\n",argv[0]);
-     printf ("example: %s platform_script.lua\n",argv[0]);
-     exit(1);
+    printf("Usage: %s platform_script[.lua]\n", argv[0]);
+    printf("example: %s platform_script.lua\n", argv[0]);
+    exit(1);
   }
   res = test_all(argv[1]);
   MSG_clean();