X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4680606bad1fe9674554b6238add19de1bf6dde0..9553ec877f1dc96e9b44fbac31d47773e40adae3:/examples/msg/mc/example_liveness_with_cycle.c

diff --git a/examples/msg/mc/example_liveness_with_cycle.c b/examples/msg/mc/example_liveness_with_cycle.c
index 58703a15e9..80765b7203 100644
--- a/examples/msg/mc/example_liveness_with_cycle.c
+++ b/examples/msg/mc/example_liveness_with_cycle.c
@@ -1,7 +1,6 @@
 /***************** Centralized Mutual Exclusion Algorithm *********************/
 /* This example implements a centralized mutual exclusion algorithm.          */
-/* There is no bug on it, it is just provided to test the state space         */
-/* reduction of DPOR.                                                         */
+/* CS requests of client 2 not satisfied                                      */
 /******************************************************************************/
 
 #include "msg/msg.h"
@@ -12,7 +11,7 @@
 #include "y.tab.c"
 
 #define AMOUNT_OF_CLIENTS 2
-#define CS_PER_PROCESS 1
+#define CS_PER_PROCESS 4
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(example_liveness_with_cycle, "my log messages");
 
@@ -29,9 +28,6 @@ int predQ(){
 }
 
 
-//xbt_dynar_t listeVars -> { void *ptr; int size (nb octets); } => liste de structures 
-//=> parcourir la liste et comparer les contenus de chaque pointeur
-
 int coordinator(int argc, char *argv[])
 {
   xbt_dynar_t requests = xbt_dynar_new(sizeof(char *), NULL);   // dynamic vector storing requests (which are char*)
@@ -43,9 +39,8 @@ int coordinator(int argc, char *argv[])
     const char *kind = MSG_task_get_name(task); //is it a request or a release?
     if (!strcmp(kind, "request")) {     // that's a request
       char *req = MSG_task_get_data(task);
-      //XBT_INFO("Req %s", req);
       if (CS_used) {            // need to push the request in the vector
-        XBT_INFO("CS already used. Queue the request");
+        XBT_INFO("CS already used. Queue the request of client %d", atoi(req) +1);
         xbt_dynar_push(requests, &req);
       } else {                  // can serve it immediatly
 	if(strcmp(req, "1") == 0){
@@ -53,24 +48,19 @@ int coordinator(int argc, char *argv[])
 	  MSG_task_send(answer, req);
 	  CS_used = 1;
 	  XBT_INFO("CS idle. Grant immediatly");
-	}else{
-	  m_task_t answer = MSG_task_create("notgrant", 0, 1000, NULL);
-	  MSG_task_send(answer, req);
-	  XBT_INFO("CS idle but not grant");
 	}
       }
     } else {                    // that's a release. Check if someone was waiting for the lock
       if (xbt_dynar_length(requests) > 0) {
-        XBT_INFO("CS release. Grant to queued requests (queue size: %lu)",
-              xbt_dynar_length(requests));
+        XBT_INFO("CS release. Grant to queued requests (queue size: %lu)", xbt_dynar_length(requests));
         char *req ;
-	xbt_dynar_pop(requests, &req);
+	xbt_dynar_get_cpy(requests, (xbt_dynar_length(requests) - 1), &req);
 	if(strcmp(req, "1") == 0){
+	  xbt_dynar_pop(requests, &req);
 	  MSG_task_send(MSG_task_create("grant", 0, 1000, NULL), req);
 	  todo--;
 	}else{
-	  MSG_task_send(MSG_task_create("notgrant", 0, 1000, NULL), req);
-	  todo--;
+	   CS_used = 0;
 	}
       } else {                  // nobody wants it
         XBT_INFO("CS release. resource now idle");
@@ -87,42 +77,46 @@ int coordinator(int argc, char *argv[])
 int client(int argc, char *argv[])
 {
   int my_pid = MSG_process_get_PID(MSG_process_self());
-  // use my pid as name of mailbox to contact me
+
   char *my_mailbox = bprintf("%s", argv[1]);
-  // request the CS 3 times, sleeping a bit in between
   int i;
- 
+
+  // request the CS 4 times, sleeping a bit in between
   for (i = 0; i < CS_PER_PROCESS; i++) {
       
     XBT_INFO("Ask the request");
-    MSG_task_send(MSG_task_create("request", 0, 1000, my_mailbox),
-                  "coordinator");
+    MSG_task_send(MSG_task_create("request", 0, 1000, my_mailbox), "coordinator");
+
     if(strcmp(my_mailbox, "2") == 0){
       p = 1;
       q = 0;
+      XBT_DEBUG("Propositions changed : p=1, q=0");
     }
+
     // wait the answer
     m_task_t grant = NULL;
     MSG_task_receive(&grant, my_mailbox);
-    const char *kind = MSG_task_get_name(grant);
-    if(strcmp(kind, "grant") == 0){
-      if(strcmp(my_mailbox, "2") == 0){
-	q = 1;
-	p = 0;
-      }
-      MSG_task_destroy(grant);
-      XBT_INFO("%s got the answer. Sleep a bit and release it", argv[1]);
-      MSG_process_sleep(1);
-      MSG_task_send(MSG_task_create("release", 0, 1000,NULL ),
-		    "coordinator");
+
+    if(strcmp(my_mailbox, "2") == 0){
+      q = 1;
+      p = 0;
+      XBT_DEBUG("Propositions changed : p=0, q=1");
     }
 
+
+    MSG_task_destroy(grant);
+    XBT_INFO("%s got the answer. Sleep a bit and release it", argv[1]);
+    MSG_process_sleep(1);
+    MSG_task_send(MSG_task_create("release", 0, 1000, NULL), "coordinator");
+
     MSG_process_sleep(my_pid);
     
-    q=0;
-    p=0;
+    if(strcmp(my_mailbox, "2") == 0){
+      q=0;
+      p=0;
+      XBT_DEBUG("Propositions changed : p=0, q=0");
+    }
     
-
   }
 
   XBT_INFO("Got all the CS I wanted (%s), quit now", my_mailbox);
@@ -142,8 +136,7 @@ int main(int argc, char *argv[])
   MSG_function_register("coordinator", coordinator);
   MSG_function_register("client", client);
   MSG_launch_application("deploy_mutex2.xml");
-  MSG_main_liveness_stateless(automaton);
-  //MSG_main();
+  MSG_main_liveness_stateless(automaton, argv[0]);
   
   return 0;
 }