(1) structure code a little better

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index c3e5830211c9276ec7b5004504fbb9472df32069..bcb9d61a5e6d02e317a9428395b451b7e6285aec 100644 (file)
--- a/model.h
+++ b/model.h
@@ -29,6 +29,7 @@ class Promise;
  */
 struct model_params {
        int maxreads;
+       int maxfuturedelay;
 };
 
 /**
@@ -60,6 +61,7 @@ public:
        void add_thread(Thread *t);
        void remove_thread(Thread *t);
        Thread * get_thread(thread_id_t tid) { return thread_map->get(id_to_int(tid)); }
+       Thread * get_thread(ModelAction *act) { return get_thread(act->get_tid()); }
 
        thread_id_t get_next_id();
        int get_num_threads();
@@ -90,7 +92,7 @@ private:
        bool has_asserted() {return asserted;}
        void reset_asserted() {asserted=false;}
        int num_executions;
-
+       bool promises_expired();
        const model_params params;
 
        /**
@@ -114,6 +116,8 @@ private:
        bool resolve_promises(ModelAction *curr);
        void compute_promises(ModelAction *curr);
 
+
+       void check_curr_backtracking(ModelAction * curr);
        void add_action_to_lists(ModelAction *act);
        ModelAction * get_last_action(thread_id_t tid);
        ModelAction * get_last_seq_cst(const void *location);