Update copyright notices

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

diff --git a/examples/msg/masterslave/masterslave_cluster.c b/examples/msg/masterslave/masterslave_cluster.c
index 91579be..e0cf330 100644 (file)
--- a/examples/msg/masterslave/masterslave_cluster.c
+++ b/examples/msg/masterslave/masterslave_cluster.c
@@ -1,11 +1,11 @@
-/* Copyright (c) 2010. The SimGrid Team.
+/* Copyright (c) 2010-2015. 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"            /* Yeah! If you want to use msg, you need to include msg/msg.h */
+#include "simgrid/msg.h"        /* Yeah! If you want to use msg, you need to include simgrid/msg.h */
 #include "surf/surfxml_parse.h" /* to override surf_parse and bypass the parser */
 
 /* Create a log channel to have nice outputs. */
@@ -16,7 +16,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
 
 #define FINALIZE ((void*)221297)        /* a magic number to tell people to stop working */
 
-MSG_error_t test_all(const char *platform_file);
+msg_error_t test_all(const char *platform_file);
 
 
 int master(int argc, char *argv[]);
@@ -59,7 +59,7 @@ int master(int argc, char *argv[])
     slaves = xbt_new0(msg_host_t, slaves_count);
 
     for (i = 4; i < argc; i++) {
-      slaves[i - 4] = MSG_get_host_by_name(argv[i]);
+      slaves[i - 4] = MSG_host_by_name(argv[i]);
       if (slaves[i - 4] == NULL) {
         XBT_INFO("Unknown host %s. Stopping Now! ", argv[i]);
         abort();
@@ -149,8 +149,8 @@ static int bypass_deployment(void)
     XBT_DEBUG("  <process host=\"c-0.me\" function=\"master\">");
     SURFXML_BUFFER_SET(process_host, "c-0.me");
     SURFXML_BUFFER_SET(process_function, "master");
-    SURFXML_BUFFER_SET(process_start_time, "-1.0");
-    SURFXML_BUFFER_SET(process_kill_time, "-1.0");
+    SURFXML_BUFFER_SET(process_start___time, "-1.0");
+    SURFXML_BUFFER_SET(process_kill___time, "-1.0");
     SURFXML_START_TAG(process);
 
     XBT_DEBUG("    <argument value=\"%s\"/>",bprintf("%d",nb_host-1));
@@ -183,8 +183,8 @@ static int bypass_deployment(void)
     XBT_DEBUG("  <process host=\"%s.me\" function=\"slave\"/>",bprintf("c-%d",i));
     SURFXML_BUFFER_SET(process_host, bprintf("c-%d.me",i));
     SURFXML_BUFFER_SET(process_function, "slave");
-    SURFXML_BUFFER_SET(process_start_time, "-1.0");
-    SURFXML_BUFFER_SET(process_kill_time, "-1.0");
+    SURFXML_BUFFER_SET(process_start___time, "-1.0");
+    SURFXML_BUFFER_SET(process_kill___time, "-1.0");
     SURFXML_START_TAG(process);
     SURFXML_END_TAG(process);
   }
@@ -197,9 +197,9 @@ static int bypass_deployment(void)
 }
 
 /** Test function */
-MSG_error_t test_all(const char *platform_file)
+msg_error_t test_all(const char *platform_file)
 {
-  MSG_error_t res = MSG_OK;
+  msg_error_t res = MSG_OK;
   MSG_create_environment(platform_file);
   MSG_function_register("master", master);
   MSG_function_register("slave", slave);
@@ -216,11 +216,10 @@ MSG_error_t test_all(const char *platform_file)
 /** Main function */
 int main(int argc, char *argv[])
 {
-  MSG_error_t res = MSG_OK;
+  msg_error_t res = MSG_OK;
 
   MSG_init(&argc, argv);
   res = test_all(argv[1]);
-  MSG_clean();
 
   if (res == MSG_OK)
     return 0;