X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/362b4dbfe18e585af36789119acafa5d5350fa20..347996b4a10c4e8579080692afa60e0afb88b60a:/examples/msg/mc/bugged1.c?ds=sidebyside

diff --git a/examples/msg/mc/bugged1.c b/examples/msg/mc/bugged1.c
index 80fbae2723..aa397f8d53 100644
--- a/examples/msg/mc/bugged1.c
+++ b/examples/msg/mc/bugged1.c
@@ -1,10 +1,17 @@
+/* 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. */
+
 /******************** Non-deterministic message ordering  *********************/
 /* Server assumes a fixed order in the reception of messages from its clients */
 /* which is incorrect because the message ordering is non-deterministic       */
 /******************************************************************************/
 
-#include <msg/msg.h>
+#include <simgrid/msg.h>
 #include <simgrid/modelchecker.h>
+
 #define N 3
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(example, "this example");
@@ -14,7 +21,7 @@ int client(int argc, char *argv[]);
 
 int server(int argc, char *argv[])
 {
-  m_task_t task = NULL;
+  msg_task_t task = NULL;
   int count = 0;
   while (count < N) {
     if (task) {
@@ -24,7 +31,7 @@ int server(int argc, char *argv[])
     MSG_task_receive(&task, "mymailbox");
     count++;
   }
-  MC_assert(atoi(MSG_task_get_name(task)) == 3);
+  MC_assert(xbt_str_parse_int(MSG_task_get_name(task), "Task names must be integers, not '%s'") == 3);
 
   XBT_INFO("OK");
   return 0;
@@ -33,7 +40,7 @@ int server(int argc, char *argv[])
 int client(int argc, char *argv[])
 {
 
-  m_task_t task =
+  msg_task_t task =
       MSG_task_create(argv[1], 0 /*comp cost */ , 10000 /*comm size */ ,
                       NULL /*arbitrary data */ );
 
@@ -46,7 +53,7 @@ int client(int argc, char *argv[])
 int main(int argc, char *argv[])
 {
 
-  MSG_global_init(&argc, argv);
+  MSG_init(&argc, argv);
 
   MSG_create_environment("platform.xml");
 
@@ -58,8 +65,6 @@ int main(int argc, char *argv[])
 
   MSG_main();
 
-  MSG_clean();
-
   return 0;
 
 }