model: add release sequence support

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index 10f84c59ba6710ce1ad3a224d4d9f1784929254c..dea744c8bda1e6f61ab1b4173ae45e0bd5291ba8 100644 (file)
--- a/model.h
+++ b/model.h
@@ -61,6 +61,8 @@ public:
        bool isfeasible();
        bool isfinalfeasible();
        void check_promises(ClockVector *old_cv, ClockVector * merge_cv);
+       void get_release_seq_heads(ModelAction *act,
+                       std::vector<const ModelAction *> *release_heads);
 
        void finish_execution();
 
@@ -99,10 +101,12 @@ private:
        ModelAction * get_parent_action(thread_id_t tid);
        ModelAction * get_last_seq_cst(const void *location);
        void build_reads_from_past(ModelAction *curr);
-       ModelAction * process_rmw(ModelAction * curr);
-       void post_r_modification_order(ModelAction * curr, const ModelAction *rf);
-       void r_modification_order(ModelAction * curr, const ModelAction *rf);
-       void w_modification_order(ModelAction * curr);
+       ModelAction * process_rmw(ModelAction *curr);
+       void post_r_modification_order(ModelAction *curr, const ModelAction *rf);
+       void r_modification_order(ModelAction *curr, const ModelAction *rf);
+       void w_modification_order(ModelAction *curr);
+       bool release_seq_head(const ModelAction *rf,
+                       std::vector<const ModelAction *> *release_heads) const;
 
        ModelAction *current_action;
        ModelAction *diverge;
@@ -117,11 +121,27 @@ private:
        HashTable<const void *, action_list_t, uintptr_t, 4> *obj_map;
 
        HashTable<void *, std::vector<action_list_t>, uintptr_t, 4 > *obj_thrd_map;
-       std::vector<Promise *> * promises;
+       std::vector<Promise *> *promises;
        std::vector<ModelAction *> *thrd_last_action;
        NodeStack *node_stack;
        ModelAction *next_backtrack;
+
+       /**
+        * @brief The modification order graph
+        *
+        * A direceted acyclic graph recording observations of the modification
+        * order on all the atomic objects in the system. This graph should
+        * never contain any cycles, as that represents a violation of the
+        * memory model (total ordering). This graph really consists of many
+        * disjoint (unconnected) subgraphs, each graph corresponding to a
+        * separate ordering on a distinct object.
+        *
+        * The edges in this graph represent the "ordered before" relation,
+        * such that <tt>a --> b</tt> means <tt>a</tt> was ordered before
+        * <tt>b</tt>.
+        */
        CycleGraph *mo_graph;
+
        bool failed_promise;
 };