sed -i -e 's/\t/ /g' [sources] Please people, stop using tabs

[simgrid.git] / examples / msg / ns3 / ns3.c

diff --git a/examples/msg/ns3/ns3.c b/examples/msg/ns3/ns3.c
index d1ffeee..fecc41c 100644 (file)
--- a/examples/msg/ns3/ns3.c
+++ b/examples/msg/ns3/ns3.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2012. The SimGrid Team.
+/* Copyright (c) 2007-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "msg/msg.h"
+#include "simgrid/msg.h"
 #include "xbt/log.h"
 #include "xbt/asserts.h"
 
@@ -90,7 +90,7 @@ int master(int argc, char *argv[])
     gl_data_size[id] = task_comm_size;
   }
 
-  {                             /* Process organisation */
+  {                             /* Process organization */
     MSG_get_host_by_name(slavename);
   }
 
@@ -169,7 +169,7 @@ int slave(int argc, char *argv[])
   
   XBT_INFO("FLOW[%d] : Receive %.0f bytes from %s to %s",
       id,
-      MSG_task_get_data_size(task),
+      MSG_task_get_bytes_amount(task),
        masternames[id],
        slavenames[id]);
 //  MSG_task_execute(task);
@@ -185,8 +185,6 @@ msg_error_t test_all(const char *platform_file,
 {
   msg_error_t res = MSG_OK;
 
-  /* MSG_config("workstation/model", "GTNETS"); */
-  /* MSG_config("workstation/model","KCCFLN05"); */
   {                             /*  Simulation setting */
     MSG_create_environment(platform_file);
   }
@@ -211,15 +209,12 @@ int main(int argc, char *argv[])
   bool_printed = 0;
 
   MSG_init(&argc, argv);
-  if (argc < 3) {
-    printf("Usage: %s platform_file deployment_file\n", argv[0]);
-    exit(1);
-  }
+  xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
+            "\tExample: %s platform.xml deployment.xml\n", 
+            argv[0], argv[0]);
+   
 
   res = test_all(argv[1], argv[2]);
 
-  if (res == MSG_OK)
-    return 0;
-  else
-    return 1;
-}                               /* end_of_main */
+  return res != MSG_OK;
+}