From: Marion Guthmuller <marion.guthmuller@loria.fr>
Date: Thu, 14 Jun 2012 21:23:33 +0000 (+0200)
Subject: model-checker : examples updated with new lex and yacc parsing
X-Git-Tag: v3_8~599
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/409f7a8342cc507a9117bfda8b782bf862670005

model-checker : examples updated with new lex and yacc parsing
---

diff --git a/examples/msg/mc/bugged1_for_liveness.c b/examples/msg/mc/bugged1_for_liveness.c
index 7ca139c95e..10cda7e9f3 100644
--- a/examples/msg/mc/bugged1_for_liveness.c
+++ b/examples/msg/mc/bugged1_for_liveness.c
@@ -7,9 +7,7 @@
 #include "msg/msg.h"
 #include "mc/mc.h"
 #include "xbt/automaton.h"
-#include "xbt/automatonparse_promela.h"
 #include "bugged1_liveness.h"
-#include "y.tab.c"
 
 #define AMOUNT_OF_CLIENTS 2
 #define CS_PER_PROCESS 2
@@ -130,18 +128,16 @@ int client(int argc, char *argv[])
 
 int main(int argc, char *argv[])
 {
-  init();
-  yyparse();
-  automaton = get_automaton();
-  xbt_new_propositional_symbol(automaton,"r", &predR); 
-  xbt_new_propositional_symbol(automaton,"cs", &predCS); 
+  xbt_automaton_t a = MC_create_automaton("promela1_bugged1_liveness");
+  xbt_new_propositional_symbol(a,"r", &predR); 
+  xbt_new_propositional_symbol(a,"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_bugged1_liveness.xml");
-  MSG_main_liveness(automaton);
+  MSG_main_liveness(a);
 
   return 0;
 }
diff --git a/examples/msg/mc/bugged1_while_liveness.c b/examples/msg/mc/bugged1_while_liveness.c
index 1e56dada33..23ddc734da 100644
--- a/examples/msg/mc/bugged1_while_liveness.c
+++ b/examples/msg/mc/bugged1_while_liveness.c
@@ -7,9 +7,7 @@
 #include "msg/msg.h"
 #include "mc/mc.h"
 #include "xbt/automaton.h"
-#include "xbt/automatonparse_promela.h"
 #include "bugged1_liveness.h"
-#include "y.tab.c"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(bugged1_liveness, "my log messages");
 
@@ -120,18 +118,17 @@ int client(int argc, char *argv[])
 
 int main(int argc, char *argv[])
 {
-  init();
-  yyparse();
-  automaton = get_automaton();
-  xbt_new_propositional_symbol(automaton,"r", &predR); 
-  xbt_new_propositional_symbol(automaton,"cs", &predCS); 
+
+  xbt_automaton_t a = MC_create_automaton("promela1_bugged1_liveness");
+  xbt_new_propositional_symbol(a,"r", &predR); 
+  xbt_new_propositional_symbol(a,"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_bugged1_liveness.xml");
-  MSG_main_liveness(automaton);
+  MSG_main_liveness(a);
 
   return 0;
 }
diff --git a/examples/msg/mc/bugged2_liveness.c b/examples/msg/mc/bugged2_liveness.c
index 8a060a3f32..09ec963ce4 100644
--- a/examples/msg/mc/bugged2_liveness.c
+++ b/examples/msg/mc/bugged2_liveness.c
@@ -7,9 +7,7 @@
 #include "msg/msg.h"
 #include "mc/mc.h"
 #include "xbt/automaton.h"
-#include "xbt/automatonparse_promela.h"
 #include "bugged2_liveness.h"
-#include "y.tab.c"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(bugged2_liveness, "my log messages");
 
@@ -174,13 +172,11 @@ int main(int argc, char *argv[])
   buffer = malloc(8*sizeof(char));
   buffer[0]='\0';
 
-  init();
-  yyparse();
-  automaton = get_automaton();
-  xbt_new_propositional_symbol(automaton,"pready", &predPready); 
-  xbt_new_propositional_symbol(automaton,"cready", &predCready); 
-  xbt_new_propositional_symbol(automaton,"consume", &predConsume);
-  xbt_new_propositional_symbol(automaton,"produce", &predProduce); 
+  xbt_automaton_t a = MC_create_automaton("promela2_bugged2_liveness");
+  xbt_new_propositional_symbol(a,"pready", &predPready); 
+  xbt_new_propositional_symbol(a,"cready", &predCready); 
+  xbt_new_propositional_symbol(a,"consume", &predConsume);
+  xbt_new_propositional_symbol(a,"produce", &predProduce); 
   
   MSG_global_init(&argc, argv);
   MSG_create_environment("../msg_platform.xml");
@@ -188,7 +184,7 @@ int main(int argc, char *argv[])
   MSG_function_register("consumer", consumer);
   MSG_function_register("producer", producer);
   MSG_launch_application("deploy_bugged2_liveness.xml");
-  MSG_main_liveness(automaton);
+  MSG_main_liveness(a);
 
   return 0;
 
diff --git a/examples/msg/mc/centralized_liveness.c b/examples/msg/mc/centralized_liveness.c
index 77183df608..b1438e2775 100644
--- a/examples/msg/mc/centralized_liveness.c
+++ b/examples/msg/mc/centralized_liveness.c
@@ -6,9 +6,7 @@
 #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");
  
@@ -100,17 +98,16 @@ int client(int argc, char *argv[])
 
 int main(int argc, char *argv[])
 {
-  init();
-  yyparse();
-  automaton = get_automaton();
-  xbt_new_propositional_symbol(automaton,"cs", &predCS); 
+  
+  xbt_automaton_t a = MC_create_automaton("promela_centralized_liveness");
+  xbt_new_propositional_symbol(a,"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_liveness(a);
 
   return 0;
 
diff --git a/examples/msg/mc/centralized_liveness_deadlock.c b/examples/msg/mc/centralized_liveness_deadlock.c
index ba050d64c3..e58364ed43 100644
--- a/examples/msg/mc/centralized_liveness_deadlock.c
+++ b/examples/msg/mc/centralized_liveness_deadlock.c
@@ -6,9 +6,7 @@
 #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");
  
@@ -97,17 +95,16 @@ int client(int argc, char *argv[])
 
 int main(int argc, char *argv[])
 {
-  init();
-  yyparse();
-  automaton = get_automaton();
-  xbt_new_propositional_symbol(automaton,"cs", &predCS); 
+
+  xbt_automaton_t a = MC_create_automaton("promela_centralized_liveness");
+  xbt_new_propositional_symbol(a,"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_liveness(a);
 
   return 0;
 
diff --git a/examples/msg/mc/test_snapshot.c b/examples/msg/mc/test_snapshot.c
index 865ece3cba..13ca8d00fd 100644
--- a/examples/msg/mc/test_snapshot.c
+++ b/examples/msg/mc/test_snapshot.c
@@ -3,7 +3,7 @@
 #include "xbt/automaton.h"
 #include "xbt/automatonparse_promela.h"
 #include "test_snapshot.h"
-#include "y.tab.c"
+//#include "y.tab.c"
 #include <stdlib.h>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(test_snapshot, "my log messages");