fp => fd (for file descriptor)

[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 8ef2d03..f014dcc 100644 (file)
--- a/examples/msg/mc/bugged1_liveness.c
+++ b/examples/msg/mc/bugged1_liveness.c
@@ -11,6 +11,9 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(bugged1_liveness, "my log messages");
 
+#define NB_REQUESTS 3
+#define NB_CLIENTS 3
+
 int r=0; 
 int cs=0;
 
@@ -29,29 +32,26 @@ int coordinator(int argc, char *argv[])
   int CS_used = 0;   
   msg_task_t task = NULL, answer = NULL;        
 
-  while (1) {
+  int i;
+
+  for(i=0; i<(NB_REQUESTS * NB_CLIENTS); i++){
     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.");
+        //XBT_INFO("CS already used.");
       } else {               
-        if(strcmp(req, "2") == 0){
-          XBT_INFO("CS idle. Grant immediatly");
-          MC_compare();
+        if(strcmp(req, "1") != 0){
+          //XBT_INFO("CS idle. Grant immediatly");
           answer = MSG_task_create("grant", 0, 1000, NULL);
-          XBT_INFO("answer coordinator : %p", answer);
           MSG_task_send(answer, req);
           CS_used = 1;
           answer = NULL;
         }
       }
     } else {         
-      XBT_INFO("CS release. resource now idle");
+      //XBT_INFO("CS release. resource now idle");
       CS_used = 0;
     }
     MSG_task_destroy(task);
@@ -66,43 +66,40 @@ 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;
+  
+  int i;
 
-
-  while(1) {
+  for(i=0; i<NB_REQUESTS; i++){
       
-    XBT_INFO("Ask the request");
+    //XBT_INFO("Ask the request");
     MSG_task_send(MSG_task_create("request", 0, 1000, my_mailbox), "coordinator");
 
     if(strcmp(my_mailbox, "1") == 0){
       r = 1;
       cs = 0;
-      XBT_INFO("Propositions changed : r=1, cs=0");
+      //XBT_INFO("Propositions changed : r=1, cs=0");
     }
 
     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;
       r = 0;
-      XBT_INFO("Propositions changed : r=0, cs=1");
+      //XBT_INFO("Propositions changed : r=0, cs=1");
     }
 
     MSG_task_destroy(grant);
     grant = NULL;
     kind = NULL;
 
-    XBT_INFO("%s got the answer. Sleep a bit and release it", argv[1]);
+    //XBT_INFO("%s got the answer. Sleep a bit and release it", argv[1]);
 
     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;
@@ -112,7 +109,7 @@ int client(int argc, char *argv[])
     if(strcmp(my_mailbox, "1") == 0){
       cs=0;
       r=0;
-      XBT_INFO("Propositions changed : r=0, cs=0");
+      //XBT_INFO("Propositions changed : r=0, cs=0");
     }
     
   }
@@ -125,7 +122,7 @@ int main(int argc, char *argv[])
 
   MSG_init(&argc, argv);
 
-  MSG_config("model-check/property","promela1_bugged1_liveness");
+  MSG_config("model-check/property","promela_bugged1_liveness");
   MC_automaton_new_propositional_symbol("r", &predR);
   MC_automaton_new_propositional_symbol("cs", &predCS);