model-checker : new example for liveness properties

diff --git a/examples/msg/mc/centralized_liveness.c b/examples/msg/mc/centralized_liveness.c
new file mode 100644 (file)
index 0000000..350c59b
--- /dev/null
+++ b/examples/msg/mc/centralized_liveness.c
@@ -0,0 +1,108 @@
+#include "msg/msg.h"
+#include "mc/mc.h"
+#include "xbt/automaton.h"
+#include "xbt/automatonparse_promela.h"
+#include "centralized_liveness.h"
+#include "y.tab.c"
+
+#define AMOUNT_OF_CLIENTS 2
+#define CS_PER_PROCESS 1
+
+XBT_LOG_NEW_DEFAULT_CATEGORY(centralized, "my log messages");
+ 
+int cs2 = 0;
+
+int predCS2(){
+  return cs2;
+}
+
+
+int coordinator(int argc, char **argv);
+int client(int argc, char **argv);
+
+int coordinator(int argc, char *argv[])
+{
+  xbt_dynar_t requests = xbt_dynar_new(sizeof(char *), NULL);   // dynamic vector storing requests (which are char*)
+  int CS_used = 0;              // initially the CS is idle
+  
+  while (1) {
+    m_task_t task = NULL;
+    MSG_task_receive(&task, "coordinator");
+    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);
+      if (CS_used) {            // need to push the request in the vector
+        XBT_INFO("CS already used. Queue the request");
+        xbt_dynar_push(requests, &req);
+      } else {                  // can serve it immediatly
+        XBT_INFO("CS idle. Grant immediatly");
+        m_task_t answer = MSG_task_create("grant", 0, 1000, NULL);
+        MSG_task_send(answer, req);
+        CS_used = 1;
+      }
+    } else {                    // that's a release. Check if someone was waiting for the lock
+      if (!xbt_dynar_is_empty(requests)) {
+        XBT_INFO("CS release. Grant to queued requests (queue size: %lu)",
+              xbt_dynar_length(requests));
+        char *req;
+        xbt_dynar_pop(requests, &req);
+        MSG_task_send(MSG_task_create("grant", 0, 1000, NULL), req);
+      } else {                  // nobody wants it
+        XBT_INFO("CS release. resource now idle");
+        CS_used = 0;
+      }
+    }
+    MSG_task_destroy(task);
+  }
+  
+  return 0;
+}
+
+int client(int argc, char *argv[])
+{
+  int my_pid = MSG_process_get_PID(MSG_process_self());
+  char *my_mailbox = bprintf("%s", argv[1]);
+ 
+  while(1){
+
+    if(!strcmp(my_mailbox, "2"))
+      cs2 = 0;
+
+    XBT_INFO("Client (%s) ask the request", my_mailbox);
+    MSG_task_send(MSG_task_create("request", 0, 1000, my_mailbox),
+                  "coordinator");
+    // wait the answer
+    m_task_t grant = NULL;
+    MSG_task_receive(&grant, my_mailbox);
+    MSG_task_destroy(grant);
+    XBT_INFO("got the answer. Sleep a bit and release it");
+
+    if(!strcmp(my_mailbox, "2"))
+      cs2 = 1;
+
+    MSG_process_sleep(1);
+    MSG_task_send(MSG_task_create("release", 0, 1000, NULL),
+                  "coordinator");
+    MSG_process_sleep(my_pid);
+  }
+
+  return 0;
+}
+
+int main(int argc, char *argv[])
+{
+  init();
+  yyparse();
+  automaton = get_automaton();
+  xbt_new_propositional_symbol(automaton,"cs2", &predCS2); 
+  
+  MSG_global_init(&argc, argv);
+  MSG_create_environment("../msg_platform.xml");
+  MSG_function_register("coordinator", coordinator);
+  MSG_function_register("client", client);
+  MSG_launch_application("deploy_centralized_liveness.xml");
+  MSG_main_liveness(automaton, argv[0]);
+
+  return 0;
+
+}

diff --git a/examples/msg/mc/centralized_liveness.h b/examples/msg/mc/centralized_liveness.h
new file mode 100644 (file)
index 0000000..1c14031
--- /dev/null
+++ b/examples/msg/mc/centralized_liveness.h
@@ -0,0 +1,13 @@
+#ifndef _CENTRALIZED_LIVENESS_H
+#define _CENTRALIZED_LIVENESS_H
+
+int yyparse(void);
+int yywrap(void);
+int yylex(void);
+
+int predCS2(void);
+
+int coordinator(int argc, char *argv[]);
+int client(int argc, char *argv[]);
+
+#endif 

diff --git a/examples/msg/mc/deploy_centralized_liveness.xml b/examples/msg/mc/deploy_centralized_liveness.xml
new file mode 100644 (file)
index 0000000..bd46ad7
--- /dev/null
+++ b/examples/msg/mc/deploy_centralized_liveness.xml
@@ -0,0 +1,47 @@
+<?xml version='1.0'?>
+
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+
+<platform version="3">
+
+  <process host="Tremblay" function="coordinator" />
+
+  <process host="Fafard" function="client" >
+    <argument value="1"/>
+  </process>
+
+  <process host="Boivin" function="client" >
+    <argument value="2"/>
+  </process>
+
+  <!-- <process host="TeX" function="client" >
+    <argument value="3"/>
+  </process>
+
+  <process host="Geoff" function="client" >
+    <argument value="4"/>
+  </process>
+  
+  <process host="Disney" function="client" />
+    
+  <process host="iRMX" function="client" />
+      
+  <process host="McGee" function="client" />
+
+  <process host="Gatien" function="client" />
+    
+  <process host="Laroche" function="client" />
+      
+  <process host="Tanguay" function="client" />
+
+  <process host="Morin" function="client" />
+
+  <process host="Ethernet" function="client" />
+
+  <process host="Bellemarre" function="client" />
+
+  <process host="Kuenning" function="client" />
+  
+  <process host="Gaston" function="client" /> -->
+
+</platform>

diff --git a/examples/msg/mc/promela_centralized_liveness b/examples/msg/mc/promela_centralized_liveness
new file mode 100644 (file)
index 0000000..c5169d1
--- /dev/null
+++ b/examples/msg/mc/promela_centralized_liveness
@@ -0,0 +1,11 @@
+never { /* !(GFcs2) */
+T0_init :    /* init */
+       if
+       :: (1) -> goto T0_init
+       :: (!cs2) -> goto accept_S2
+       fi;
+accept_S2 :    /* 1 */
+       if
+       :: (!cs2) -> goto accept_S2
+       fi;
+}
\ No newline at end of file