model: THREAD_JOIN synchronizes with THREAD_FINISH

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index 9c8fa87f2076a5f7c369c231d3bba89c0b93ca3b..b2b312f890328e5606887e73a62018eced76ba87 100644 (file)
--- a/model.h
+++ b/model.h
@@ -112,12 +112,13 @@ private:
         */
        void set_current_action(ModelAction *act) { priv->current_action = act; }
        Thread * check_current_action(ModelAction *curr);
+       ModelAction * initialize_curr_action(ModelAction *curr);
        bool process_read(ModelAction *curr, bool second_part_of_rmw);
        bool process_write(ModelAction *curr);
 
        bool take_step();
 
-       void check_recency(ModelAction *curr, bool already_added);
+       void check_recency(ModelAction *curr);
        ModelAction * get_last_conflict(ModelAction *act);
        void set_backtracking(ModelAction *act);
        Thread * get_next_thread(ModelAction *curr);
@@ -138,6 +139,7 @@ private:
        bool release_seq_head(const ModelAction *rf,
                        std::vector< const ModelAction *, MyAlloc<const ModelAction *> > *release_heads) const;
        bool resolve_release_sequences(void *location, work_queue_t *work_queue);
+       void do_complete_join(ModelAction *join);
 
        ModelAction *diverge;