model: add synchronize() function

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index ff4b2c1800a0a2faece1d4d19de23e9176b684da..3327683e65efb21c2fe716c6ccc6fbef1cc8dc8f 100644 (file)
--- a/model.h
+++ b/model.h
@@ -25,7 +25,7 @@ class Promise;
 class Scheduler;
 class Thread;
 class ClockVector;
-class Trace_Analysis;
+class TraceAnalysis;
 struct model_snapshot_members;
 
 /** @brief Shorthand for a list of release sequence heads */
@@ -106,7 +106,7 @@ public:
 
        const model_params params;
        Node * get_curr_node() const;
-       void add_trace_analysis(Trace_Analysis * a) {
+       void add_trace_analysis(TraceAnalysis *a) {
                trace_analyses->push_back(a);
        }
 
@@ -143,6 +143,7 @@ private:
        bool process_thread_action(ModelAction *curr);
        void process_relseq_fixup(ModelAction *curr, work_queue_t *work_queue);
        bool read_from(ModelAction *act, const ModelAction *rf);
+       bool synchronize(const ModelAction *first, ModelAction *second);
        bool check_action_enabled(ModelAction *curr);
 
        Thread * take_step(ModelAction *curr);
@@ -220,7 +221,7 @@ private:
        SnapVector<ModelAction *> * const thrd_last_action;
        SnapVector<ModelAction *> * const thrd_last_fence_release;
        NodeStack * const node_stack;
-       ModelVector<Trace_Analysis *> * trace_analyses;
+       ModelVector<TraceAnalysis *> * trace_analyses;
 
 
        /** Private data members that should be snapshotted. They are grouped