-/* 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
#include "simgrid/msg.h"
#include "mc/mc.h"
-#include "xbt/automaton.h"
#include "bugged1_liveness.h"
XBT_LOG_NEW_DEFAULT_CATEGORY(bugged1_liveness, "my log messages");
}
#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;
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);
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());
release = NULL;
MSG_process_sleep(my_pid);
-
+
if(strcmp(my_mailbox, "1") == 0){
cs=0;
r=0;
}
}
-
return 0;
}
{
#ifdef GARBAGE_STACK
// At this point the stack of the callee (client) is probably filled with
- // zeros and unitialized variables will contain 0. This call will place
+ // zeros and uninitialized variables will contain 0. This call will place
// random byes in the stack of the callee:
garbage_stack();
#endif
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();