model: schedule appropriate fence backtracking points

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index cd9c3989bde935ce2ec8c67da5ddd4490a3b3e34..de1fc639e5514e190cdd7a0751b4719ac69303a6 100644 (file)
--- a/model.h
+++ b/model.h
@@ -8,25 +8,29 @@
 #include <vector>
 #include <cstddef>
 #include <ucontext.h>
+#include <inttypes.h>
 
 #include "mymemory.h"
-#include "action.h"
 #include "hashtable.h"
 #include "workqueue.h"
 #include "config.h"
 #include "modeltypes.h"
 
 /* Forward declaration */
+class Node;
 class NodeStack;
 class CycleGraph;
 class Promise;
 class Scheduler;
 class Thread;
+class ClockVector;
 struct model_snapshot_members;
 
 /** @brief Shorthand for a list of release sequence heads */
 typedef std::vector< const ModelAction *, ModelAlloc<const ModelAction *> > rel_heads_list_t;
 
+typedef std::list< ModelAction *, SnapshotAlloc<ModelAction *> > action_list_t;
+
 /**
  * Model checker parameter structure. Holds run-time configuration options for
  * the model checker.
@@ -117,6 +121,7 @@ public:
        unsigned int get_num_threads() const;
        Thread * get_current_thread() const;
 
+       void switch_from_master(Thread *thread);
        uint64_t switch_to_master(ModelAction *act);
        ClockVector * get_cv(thread_id_t tid) const;
        ModelAction * get_parent_action(thread_id_t tid) const;
@@ -134,7 +139,7 @@ public:
        MEMALLOC
 private:
        /** The scheduler to use: tracks the running/ready Threads */
-       Scheduler *scheduler;
+       Scheduler * const scheduler;
 
        bool sleep_can_read_from(ModelAction *curr, const ModelAction *write);
        bool thin_air_constraint_may_allow(const ModelAction *writer, const ModelAction *reader);
@@ -148,7 +153,6 @@ private:
        modelclock_t get_next_seq_num();
 
        bool next_execution();
-       void set_current_action(ModelAction *act);
        ModelAction * check_current_action(ModelAction *curr);
        bool initialize_curr_action(ModelAction **curr);
        bool process_read(ModelAction *curr, bool second_part_of_rmw);
@@ -163,7 +167,8 @@ private:
        Thread * take_step(ModelAction *curr);
 
        void check_recency(ModelAction *curr, const ModelAction *rf);
-       ModelAction * get_last_conflict(ModelAction *act);
+       ModelAction * get_last_fence_conflict(ModelAction *act) const;
+       ModelAction * get_last_conflict(ModelAction *act) const;
        void set_backtracking(ModelAction *act);
        Thread * get_next_thread(ModelAction *curr);
        bool set_latest_backtrack(ModelAction *act);
@@ -198,24 +203,24 @@ private:
        ModelAction *earliest_diverge;
 
        ucontext_t system_context;
-       action_list_t *action_trace;
-       HashTable<int, Thread *, int> *thread_map;
+       action_list_t * const action_trace;
+       HashTable<int, Thread *, int> * const 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<const void *, action_list_t *, uintptr_t, 4> * const obj_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> *lock_waiters_map;
+       HashTable<const void *, action_list_t *, uintptr_t, 4> * const lock_waiters_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> *condvar_waiters_map;
+       HashTable<const void *, action_list_t *, uintptr_t, 4> * const condvar_waiters_map;
 
-       HashTable<void *, std::vector<action_list_t> *, uintptr_t, 4 > *obj_thrd_map;
-       std::vector< Promise *, SnapshotAlloc<Promise *> > *promises;
-       std::vector< struct PendingFutureValue, SnapshotAlloc<struct PendingFutureValue> > *futurevalues;
+       HashTable<void *, std::vector<action_list_t> *, uintptr_t, 4 > * const obj_thrd_map;
+       std::vector< Promise *, SnapshotAlloc<Promise *> > * const promises;
+       std::vector< struct PendingFutureValue, SnapshotAlloc<struct PendingFutureValue> > * const futurevalues;
 
        /**
         * List of pending release sequences. Release sequences might be
@@ -223,15 +228,15 @@ private:
         * are established. Each entry in the list may only be partially
         * filled, depending on its pending status.
         */
-       std::vector< struct release_seq *, SnapshotAlloc<struct release_seq *> > *pending_rel_seqs;
+       std::vector< struct release_seq *, SnapshotAlloc<struct release_seq *> > * const pending_rel_seqs;
 
-       std::vector< ModelAction *, SnapshotAlloc<ModelAction *> > *thrd_last_action;
-       std::vector< ModelAction *, SnapshotAlloc<ModelAction *> > *thrd_last_fence_release;
-       NodeStack *node_stack;
+       std::vector< ModelAction *, SnapshotAlloc<ModelAction *> > * const thrd_last_action;
+       std::vector< ModelAction *, SnapshotAlloc<ModelAction *> > * const thrd_last_fence_release;
+       NodeStack * const node_stack;
 
        /** Private data members that should be snapshotted. They are grouped
         * together for efficiency and maintainability. */
-       struct model_snapshot_members *priv;
+       struct model_snapshot_members * const priv;
 
        /** A special model-checker Thread; used for associating with
         *  model-checker-related ModelAcitons */
@@ -251,7 +256,7 @@ private:
         * such that <tt>a --> b</tt> means <tt>a</tt> was ordered before
         * <tt>b</tt>.
         */
-       CycleGraph *mo_graph;
+       CycleGraph * const mo_graph;
 
        /** @brief The cumulative execution stats */
        struct execution_stats stats;