towards making rmw work...

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index 97e9849f0bbb441c5af72999e3453bc9adbe5745..8593b98f06a186aa7e297cd661219edf1c69c264 100644 (file)
--- a/model.h
+++ b/model.h
@@ -1,5 +1,5 @@
 /** @file model.h
- *  @brief Core model checker. 
+ *  @brief Core model checker.
  */
 
 #ifndef __MODEL_H__
@@ -13,15 +13,14 @@
 
 #include "schedule.h"
 #include "mymemory.h"
-#include <utility>
 #include "libthreads.h"
-#include "libatomic.h"
 #include "threads.h"
 #include "action.h"
 #include "clockvector.h"
 
 /* Forward declaration */
 class NodeStack;
+class CycleGraph;
 
 /** @brief The central structure for model-checking */
 class ModelChecker {
@@ -56,6 +55,7 @@ public:
        int switch_to_master(ModelAction *act);
        ClockVector * get_cv(thread_id_t tid);
        bool next_execution();
+       bool isfeasible();
 
        MEMALLOC
 private:
@@ -80,7 +80,12 @@ private:
        void add_action_to_lists(ModelAction *act);
        ModelAction * get_last_action(thread_id_t tid);
        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 r_modification_order(ModelAction * curr, const ModelAction *rf);
+       void w_modification_order(ModelAction * curr);
+
 
        ModelAction *current_action;
        ModelAction *diverge;
@@ -89,10 +94,16 @@ private:
        ucontext_t *system_context;
        action_list_t *action_trace;
        std::map<int, Thread *> *thread_map;
+
+       /** Per-object list of actions. Maps an object (i.e., memory location)
+        * to a trace of all actions performed on the object. */
+       std::map<const void *, action_list_t> *obj_map;
+
        std::map<void *, std::vector<action_list_t> > *obj_thrd_map;
        std::vector<ModelAction *> *thrd_last_action;
        NodeStack *node_stack;
        ModelAction *next_backtrack;
+       CycleGraph * cyclegraph;
 };
 
 extern ModelChecker *model;