X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/324ed35d0489e7df64745a022a3d426ff227fba2..fa94c1ceafe3f3cc43a97b1beb87926ca2648d32:/examples/msg/mc/centralized_liveness_deadlock.c

diff --git a/examples/msg/mc/centralized_liveness_deadlock.c b/examples/msg/mc/centralized_liveness_deadlock.c
index ba050d64c3..3e3fc3d619 100644
--- a/examples/msg/mc/centralized_liveness_deadlock.c
+++ b/examples/msg/mc/centralized_liveness_deadlock.c
@@ -1,14 +1,12 @@
 /***************** Centralized Mutual Exclusion Algorithm *********************/
 /* This example implements a centralized mutual exclusion algorithm.          */
-/* LTL property checked : !(GFcs)																		        */
+/* LTL property checked : !(GFcs)                                            */
 /******************************************************************************/
 
 #include "msg/msg.h"
 #include "mc/mc.h"
 #include "xbt/automaton.h"
-#include "xbt/automatonparse_promela.h"
 #include "centralized_liveness.h"
-#include "y.tab.c"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(centralized, "my log messages");
  
@@ -28,7 +26,7 @@ int coordinator(int argc, char *argv[])
   int CS_used = 0;              // initially the CS is idle
   
   while (1) {
-    m_task_t task = NULL;
+    msg_task_t task = NULL;
     MSG_task_receive(&task, "coordinator");
     const char *kind = MSG_task_get_name(task); //is it a request or a release?
     if (!strcmp(kind, "request")) {     // that's a request
@@ -38,7 +36,7 @@ int coordinator(int argc, char *argv[])
         xbt_dynar_push(requests, &req);
       } else {                  // can serve it immediatly
         XBT_INFO("CS idle. Grant immediatly");
-        m_task_t answer = MSG_task_create("grant", 0, 1000, NULL);
+        msg_task_t answer = MSG_task_create("grant", 0, 1000, NULL);
         MSG_task_send(answer, req);
         CS_used = 1;
       }
@@ -71,7 +69,7 @@ int client(int argc, char *argv[])
     MSG_task_send(MSG_task_create("request", 0, 1000, my_mailbox),
                   "coordinator");
     // wait the answer
-    m_task_t grant = NULL;
+    msg_task_t grant = NULL;
     MSG_task_receive(&grant, my_mailbox);
 
     MSG_task_destroy(grant);
@@ -97,17 +95,17 @@ int client(int argc, char *argv[])
 
 int main(int argc, char *argv[])
 {
-  init();
-  yyparse();
-  automaton = get_automaton();
-  xbt_new_propositional_symbol(automaton,"cs", &predCS); 
+
+  MSG_init(&argc, argv);
+
+  MSG_config("model-check/property","promela_centralized_liveness");
+  MC_automaton_new_propositional_symbol("cs", &predCS);
   
-  MSG_global_init(&argc, argv);
   MSG_create_environment("../msg_platform.xml");
   MSG_function_register("coordinator", coordinator);
   MSG_function_register("client", client);
   MSG_launch_application("deploy_centralized_liveness.xml");
-  MSG_main_liveness(automaton);
+  MSG_main();
 
   return 0;