A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sonar treats
[simgrid.git]
/
examples
/
msg
/
mc
/
bugged2_liveness.c
diff --git
a/examples/msg/mc/bugged2_liveness.c
b/examples/msg/mc/bugged2_liveness.c
index
51e572f
..
2310f28
100644
(file)
--- a/
examples/msg/mc/bugged2_liveness.c
+++ b/
examples/msg/mc/bugged2_liveness.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2012-201
4
. The SimGrid Team.
+/* Copyright (c) 2012-201
5
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-12,20
+12,16
@@
#include "simgrid/msg.h"
#include "mc/mc.h"
#include "simgrid/msg.h"
#include "mc/mc.h"
-#include "xbt/automaton.h"
#include "bugged2_liveness.h"
XBT_LOG_NEW_DEFAULT_CATEGORY(bugged3, "my log messages");
#include "bugged2_liveness.h"
XBT_LOG_NEW_DEFAULT_CATEGORY(bugged3, "my log messages");
-
-int cs = 0;
-int coordinator(int argc, char **argv);
-int client(int argc, char **argv);
+int cs = 0;
-int coordinator(int argc, char *argv[])
+
static
int coordinator(int argc, char *argv[])
{
int CS_used = 0; // initially the CS is idle
{
int CS_used = 0; // initially the CS is idle
-
+
while (1) {
msg_task_t task = NULL;
MSG_task_receive(&task, "coordinator");
while (1) {
msg_task_t task = NULL;
MSG_task_receive(&task, "coordinator");
@@
-36,8
+32,8
@@
int coordinator(int argc, char *argv[])
XBT_INFO("CS already used.");
msg_task_t answer = MSG_task_create("not grant", 0, 1000, NULL);
MSG_task_send(answer, req);
XBT_INFO("CS already used.");
msg_task_t answer = MSG_task_create("not grant", 0, 1000, NULL);
MSG_task_send(answer, req);
- } else { // can serve it immediatly
- XBT_INFO("CS idle. Grant immediatly");
+ } else { // can serve it immediat
e
ly
+ XBT_INFO("CS idle. Grant immediat
e
ly");
msg_task_t answer = MSG_task_create("grant", 0, 1000, NULL);
MSG_task_send(answer, req);
CS_used = 1;
msg_task_t answer = MSG_task_create("grant", 0, 1000, NULL);
MSG_task_send(answer, req);
CS_used = 1;
@@
-49,56
+45,47
@@
int coordinator(int argc, char *argv[])
MSG_task_destroy(task);
kind = NULL;
}
MSG_task_destroy(task);
kind = NULL;
}
-
+
return 0;
}
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());
char *my_mailbox = xbt_strdup(argv[1]);
const char* kind;
{
int my_pid = MSG_process_get_PID(MSG_process_self());
char *my_mailbox = xbt_strdup(argv[1]);
const char* kind;
-
- while(1){
+ while(1){
XBT_INFO("Client (%s) asks the request", my_mailbox);
XBT_INFO("Client (%s) asks the request", my_mailbox);
- MSG_task_send(MSG_task_create("request", 0, 1000, my_mailbox),
- "coordinator");
+ MSG_task_send(MSG_task_create("request", 0, 1000, my_mailbox), "coordinator");
msg_task_t answer = NULL;
MSG_task_receive(&answer, my_mailbox);
kind = MSG_task_get_name(answer);
msg_task_t answer = NULL;
MSG_task_receive(&answer, my_mailbox);
kind = MSG_task_get_name(answer);
-
- if (!strcmp(kind, "grant")) {
+ if (!strcmp(kind, "grant")) {
XBT_INFO("Client (%s) got the answer (grant). Sleep a bit and release it", my_mailbox);
XBT_INFO("Client (%s) got the answer (grant). Sleep a bit and release it", my_mailbox);
-
if(!strcmp(my_mailbox, "1"))
cs = 1;
if(!strcmp(my_mailbox, "1"))
cs = 1;
-
}else{
}else{
-
XBT_INFO("Client (%s) got the answer (not grant). Try again", my_mailbox);
XBT_INFO("Client (%s) got the answer (not grant). Try again", my_mailbox);
-
}
MSG_task_destroy(answer);
kind = NULL;
}
MSG_task_destroy(answer);
kind = NULL;
-
+
MSG_process_sleep(my_pid);
}
MSG_process_sleep(my_pid);
}
-
return 0;
}
int main(int argc, char *argv[])
{
return 0;
}
int main(int argc, char *argv[])
{
-
MSG_init(&argc, argv);
MC_automaton_new_propositional_symbol_pointer("cs", &cs);
MSG_init(&argc, argv);
MC_automaton_new_propositional_symbol_pointer("cs", &cs);
-
+
MSG_create_environment("../msg_platform.xml");
MSG_function_register("coordinator", coordinator);
MSG_function_register("client", client);
MSG_create_environment("../msg_platform.xml");
MSG_function_register("coordinator", coordinator);
MSG_function_register("client", client);