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
Merge branch 'master' into vmtrace
[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
37a287c
..
b646d82
100644
(file)
--- a/
examples/msg/mc/bugged1_liveness.c
+++ b/
examples/msg/mc/bugged1_liveness.c
@@
-31,12
+31,9
@@
int coordinator(int argc, char *argv[])
while (1) {
MSG_task_receive(&task, "coordinator");
while (1) {
MSG_task_receive(&task, "coordinator");
- XBT_INFO("task coordinator : %p", task);
const char *kind = MSG_task_get_name(task);
const char *kind = MSG_task_get_name(task);
- XBT_INFO("kind coordinator : %p", kind);
if (!strcmp(kind, "request")) {
char *req = MSG_task_get_data(task);
if (!strcmp(kind, "request")) {
char *req = MSG_task_get_data(task);
- XBT_INFO("req coordinator : %p", req);
if (CS_used) {
XBT_INFO("CS already used.");
} else {
if (CS_used) {
XBT_INFO("CS already used.");
} else {
@@
-44,7
+41,6
@@
int coordinator(int argc, char *argv[])
XBT_INFO("CS idle. Grant immediatly");
MC_compare();
answer = MSG_task_create("grant", 0, 1000, NULL);
XBT_INFO("CS idle. Grant immediatly");
MC_compare();
answer = MSG_task_create("grant", 0, 1000, NULL);
- XBT_INFO("answer coordinator : %p", answer);
MSG_task_send(answer, req);
CS_used = 1;
answer = NULL;
MSG_task_send(answer, req);
CS_used = 1;
answer = NULL;
@@
-67,7
+63,6
@@
int client(int argc, char *argv[])
int my_pid = MSG_process_get_PID(MSG_process_self());
char *my_mailbox = bprintf("%s", argv[1]);
int my_pid = MSG_process_get_PID(MSG_process_self());
char *my_mailbox = bprintf("%s", argv[1]);
- XBT_INFO("my mailbox client : %p", my_mailbox);
msg_task_t grant = NULL, release = NULL;
msg_task_t grant = NULL, release = NULL;
@@
-83,9
+78,7
@@
int client(int argc, char *argv[])
}
MSG_task_receive(&grant, my_mailbox);
}
MSG_task_receive(&grant, my_mailbox);
- XBT_INFO("grant client : %p", grant);
const char *kind = MSG_task_get_name(grant);
const char *kind = MSG_task_get_name(grant);
- XBT_INFO("kind client : %p", kind);
if((strcmp(my_mailbox, "1") == 0) && (strcmp("grant", kind) == 0)){
cs = 1;
if((strcmp(my_mailbox, "1") == 0) && (strcmp("grant", kind) == 0)){
cs = 1;
@@
-102,7
+95,6
@@
int client(int argc, char *argv[])
MSG_process_sleep(1);
release = MSG_task_create("release", 0, 1000, NULL);
MSG_process_sleep(1);
release = MSG_task_create("release", 0, 1000, NULL);
- XBT_INFO("release coordinator : %p", release);
MSG_task_send(release, "coordinator");
release = NULL;
MSG_task_send(release, "coordinator");
release = NULL;