changes

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index fbf1b3f0909ff3fd67fbb10e905d1c0b7ff9003b..e6dc06ddd97c2aef7d7c7dd17ae71854162ffb5e 100644 (file)
--- a/model.h
+++ b/model.h
@@ -1,27 +1,27 @@
 /** @file model.h
- *  @brief Core model checker. 
+ *  @brief Core model checker.
  */
 
 #ifndef __MODEL_H__
 #define __MODEL_H__
 
 #include <list>
-#include <map>
 #include <vector>
 #include <cstddef>
 #include <ucontext.h>
 
 #include "schedule.h"
 #include "mymemory.h"
-#include <utility>
 #include "libthreads.h"
-#include "libatomic.h"
 #include "threads.h"
 #include "action.h"
 #include "clockvector.h"
+#include "hashtable.h"
 
 /* Forward declaration */
 class NodeStack;
+class CycleGraph;
+class Promise;
 
 /** @brief The central structure for model-checking */
 class ModelChecker {
@@ -47,15 +47,17 @@ public:
 
        int add_thread(Thread *t);
        void remove_thread(Thread *t);
-       Thread * get_thread(thread_id_t tid) { return (*thread_map)[id_to_int(tid)]; }
+       Thread * get_thread(thread_id_t tid) { return thread_map->get(id_to_int(tid)); }
 
        thread_id_t get_next_id();
        int get_num_threads();
        modelclock_t get_next_seq_num();
 
        int switch_to_master(ModelAction *act);
-
+       ClockVector * get_cv(thread_id_t tid);
        bool next_execution();
+       bool isfeasible();
+       void check_promises(ClockVector *old_cv, ClockVector * merge_cv);
 
        MEMALLOC
 private:
@@ -80,19 +82,31 @@ 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;
        thread_id_t nextThread;
 
        ucontext_t *system_context;
        action_list_t *action_trace;
-       std::map<int, Thread *> *thread_map;
-       std::map<void *, std::vector<action_list_t> > *obj_thrd_map;
+       HashTable<int, Thread *, int> *thread_map;
+
+       /** Per-object list of actions. Maps an object (i.e., memory location)
+        * to a trace of all actions performed on the object. */
+       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<ModelAction *> *thrd_last_action;
        NodeStack *node_stack;
        ModelAction *next_backtrack;
+       CycleGraph * cyclegraph;
+       bool failed_promise;
 };
 
 extern ModelChecker *model;