X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/127880536a17bd02faba5e25df542b50c9fe72cc..be647c10d0b1d760b036f1205f314002637d9876:/examples/msg/mc/test_snapshot.c diff --git a/examples/msg/mc/test_snapshot.c b/examples/msg/mc/test_snapshot.c index fad42885c5..32de8df2b2 100644 --- a/examples/msg/mc/test_snapshot.c +++ b/examples/msg/mc/test_snapshot.c @@ -1,9 +1,8 @@ #include "msg/msg.h" #include "mc/mc.h" #include "xbt/automaton.h" -#include "xbt/automatonparse_promela.h" #include "test_snapshot.h" -#include "y.tab.c" +//#include "y.tab.c" #include XBT_LOG_NEW_DEFAULT_CATEGORY(test_snapshot, "my log messages"); @@ -121,8 +120,9 @@ int client(int argc, char *argv[]) return 0; } -int main(int argc, char *argv[]) -{ +int main(int argc, char *argv[]) { + + MSG_init(&argc, argv); d1 = xbt_dynar_new(sizeof(char *), NULL); XBT_DEBUG("Dynar d1 : %p -> %p", &d1, d1); @@ -130,18 +130,15 @@ int main(int argc, char *argv[]) xbt_dynar_push(d1, &c1); xbt_dynar_push(d1, &c1); - init(); - yyparse(); - automaton = get_automaton(); - xbt_new_propositional_symbol(automaton,"r", &predR); - xbt_new_propositional_symbol(automaton,"cs", &predCS); + MSG_config("model-check/property","promela_test_snapshot"); + MC_automaton_new_propositional_symbol("r", &predR); + 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_test_snapshot.xml"); - MSG_main_liveness(automaton, argv[0]); + MSG_main(); return 0; }