model-checker : new examples (with tesh) for verification of liveness properties...

[simgrid.git] / examples / msg / mc / bugged2.c

diff --git a/examples/msg/mc/bugged2.c b/examples/msg/mc/bugged2.c
index 22f3d54..c5c98ab 100644 (file)
--- a/examples/msg/mc/bugged2.c
+++ b/examples/msg/mc/bugged2.c
@@ -1,10 +1,17 @@
+/* Copyright (c) 2012. 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 <mc/modelchecker.h>
+#include <simgrid/modelchecker.h>
 #define N 3
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(example, "this example");
@@ -14,48 +21,49 @@ int client(int argc, char *argv[]);
 
 int server(int argc, char *argv[])
 {
-  m_task_t task1, task2;
+  msg_task_t task1 = NULL;
+  msg_task_t task2 = NULL;
   long val1, val2;
 
   MSG_task_receive(&task1, "mymailbox");
   val1 = (long) MSG_task_get_data(task1);
   MSG_task_destroy(task1);
   task1 = NULL;
-  INFO1("Received %lu", val1);
+  XBT_INFO("Received %lu", val1);
 
   MSG_task_receive(&task2, "mymailbox");
   val2 = (long) MSG_task_get_data(task2);
   MSG_task_destroy(task2);
   task2 = NULL;
-  INFO1("Received %lu", val2);
+  XBT_INFO("Received %lu", val2);
 
   MC_assert(min(val1, val2) == 1);
 
   MSG_task_receive(&task1, "mymailbox");
   val1 = (long) MSG_task_get_data(task1);
   MSG_task_destroy(task1);
-  INFO1("Received %lu", val1);
+  XBT_INFO("Received %lu", val1);
 
   MSG_task_receive(&task2, "mymailbox");
   val2 = (long) MSG_task_get_data(task2);
   MSG_task_destroy(task2);
-  INFO1("Received %lu", val2);
+  XBT_INFO("Received %lu", val2);
 
-  INFO0("OK");
+  XBT_INFO("OK");
   return 0;
 }
 
 int client(int argc, char *argv[])
 {
-  m_task_t task1 =
+  msg_task_t task1 =
       MSG_task_create("task", 0, 10000, (void *) atol(argv[1]));
-  m_task_t task2 =
+  msg_task_t task2 =
       MSG_task_create("task", 0, 10000, (void *) atol(argv[1]));
 
-  INFO1("Send %d!", atoi(argv[1]));
+  XBT_INFO("Send %d!", atoi(argv[1]));
   MSG_task_send(task1, "mymailbox");
 
-  INFO1("Send %d!", atoi(argv[1]));
+  XBT_INFO("Send %d!", atoi(argv[1]));
   MSG_task_send(task2, "mymailbox");
 
   return 0;
@@ -63,7 +71,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");