factor Cmake and clean files

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

diff --git a/examples/msg/mc/bugged1_liveness.c b/examples/msg/mc/bugged1_liveness.c
index 5a0d66b..0494521 100644 (file)
--- a/examples/msg/mc/bugged1_liveness.c
+++ b/examples/msg/mc/bugged1_liveness.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2014. The SimGrid Team.
+/* Copyright (c) 2012-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -16,7 +16,7 @@
 #include <unistd.h>
 #endif
 
-#include "msg/msg.h"
+#include "simgrid/msg.h"
 #include "mc/mc.h"
 #include "xbt/automaton.h"
 #include "bugged1_liveness.h"
@@ -37,7 +37,7 @@ static void garbage_stack(void) {
 }
 #endif
 
-int coordinator(int argc, char *argv[])
+static int coordinator(int argc, char *argv[])
 {
   int CS_used = 0;   
   msg_task_t task = NULL, answer = NULL; 
@@ -61,7 +61,7 @@ int coordinator(int argc, char *argv[])
           answer = NULL;
         }
       }
-    } else {      
+    } else {
       if (!xbt_dynar_is_empty(requests)) {
         XBT_INFO("CS release. Grant to queued requests (queue size: %lu)", xbt_dynar_length(requests));
         xbt_dynar_shift(requests, &req);
@@ -81,11 +81,10 @@ int coordinator(int argc, char *argv[])
     kind = NULL;
     req = NULL;
   }
- 
   return 0;
 }
 
-int client(int argc, char *argv[])
+static int client(int argc, char *argv[])
 {
   int my_pid = MSG_process_get_PID(MSG_process_self());
 
@@ -125,7 +124,7 @@ int client(int argc, char *argv[])
     release = NULL;
 
     MSG_process_sleep(my_pid);
-    
+
     if(strcmp(my_mailbox, "1") == 0){
       cs=0;
       r=0;
@@ -133,7 +132,6 @@ int client(int argc, char *argv[])
     }
     
   }
-
   return 0;
 }
 
@@ -151,19 +149,15 @@ static int raw_client(int argc, char *argv[])
 int main(int argc, char *argv[])
 {
   MSG_init(&argc, argv);
-  char **options = &argv[1];
 
   MC_automaton_new_propositional_symbol_pointer("r", &r);
   MC_automaton_new_propositional_symbol_pointer("cs", &cs);
 
-  const char* platform_file = options[0];
-  const char* application_file = options[1];
-
-  MSG_create_environment(platform_file);
+  MSG_create_environment(argv[1]);
 
   MSG_function_register("coordinator", coordinator);
   MSG_function_register("client", raw_client);
-  MSG_launch_application(application_file);
+  MSG_launch_application(argv[2]);
 
   MSG_main();