Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[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..90dd58a 100644 (file)
--- a/examples/msg/mc/bugged1_liveness.c
+++ b/examples/msg/mc/bugged1_liveness.c
@@ -29,22 +29,17 @@ int coordinator(int argc, char *argv[])
   int CS_used = 0;   
   msg_task_t task = NULL, answer = NULL;        
 
-  while (1) {
+  while(1){  
     MSG_task_receive(&task, "coordinator");
-    XBT_INFO("task coordinator : %p", 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);
-      XBT_INFO("req coordinator : %p", req);
       if (CS_used) {           
         XBT_INFO("CS already used.");
       } else {               
-        if(strcmp(req, "2") == 0){
+        if(strcmp(req, "1") != 0){
           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;
@@ -66,13 +61,10 @@ int client(int argc, char *argv[])
 {
   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);
+  char *my_mailbox = xbt_strdup(argv[1]);
   msg_task_t grant = NULL, release = NULL;
-
-
-  while(1) {
-      
+    
+  while(1){
     XBT_INFO("Ask the request");
     MSG_task_send(MSG_task_create("request", 0, 1000, my_mailbox), "coordinator");
 
@@ -83,9 +75,7 @@ int client(int argc, char *argv[])
     }
 
     MSG_task_receive(&grant, my_mailbox);
-    XBT_INFO("grant client : %p", 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;
@@ -102,7 +92,6 @@ int client(int argc, char *argv[])
     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;