more implementation of scanalysis...

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index 8fdfc47ae41a8fc0419d04c1570075bdddb0243e..b5c7c30520cb7138cb4219bf8c35a21a6c69d0ab 100644 (file)
--- a/model.h
+++ b/model.h
@@ -24,11 +24,11 @@ class Promise;
 class Scheduler;
 class Thread;
 class ClockVector;
+class Trace_Analysis;
 struct model_snapshot_members;
 
 /** @brief Shorthand for a list of release sequence heads */
 typedef ModelVector<const ModelAction *> rel_heads_list_t;
-
 typedef SnapList<ModelAction *> action_list_t;
 
 /**
@@ -39,6 +39,7 @@ struct model_params {
        int maxreads;
        int maxfuturedelay;
        bool yieldon;
+       bool sc_trace_analysis;
        unsigned int fairwindow;
        unsigned int enabledcount;
        unsigned int bound;
@@ -137,6 +138,12 @@ public:
 
        const model_params params;
        Node * get_curr_node() const;
+       void add_trace_analysis(Trace_Analysis * a) {
+               trace_analyses->push_back(a);
+       }
+
+       action_list_t * get_actions_on_obj(void * obj, thread_id_t tid);
+       ModelAction * get_last_action(thread_id_t tid) const;
 
        MEMALLOC
 private:
@@ -197,7 +204,6 @@ private:
 
        void check_curr_backtracking(ModelAction *curr);
        void add_action_to_lists(ModelAction *act);
-       ModelAction * get_last_action(thread_id_t tid) const;
        ModelAction * get_last_fence_release(thread_id_t tid) const;
        ModelAction * get_last_seq_cst_write(ModelAction *curr) const;
        ModelAction * get_last_seq_cst_fence(thread_id_t tid, const ModelAction *before_fence) const;
@@ -246,6 +252,8 @@ private:
        SnapVector<ModelAction *> * const thrd_last_action;
        SnapVector<ModelAction *> * const thrd_last_fence_release;
        NodeStack * const node_stack;
+       ModelVector<Trace_Analysis *> * trace_analyses;
+
 
        /** Private data members that should be snapshotted. They are grouped
         * together for efficiency and maintainability. */
@@ -274,7 +282,7 @@ private:
        /** @brief The cumulative execution stats */
        struct execution_stats stats;
        void record_stats();
-
+       void run_trace_analyses();
        void print_infeasibility(const char *prefix) const;
        bool is_feasible_prefix_ignore_relseq() const;
        bool is_infeasible() const;