add new option for uninitialized writes...

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index 0cbff4ce36bad6148bb22a6d6d40a5bf4cf7a1a1..96c1ec78a60ca343400c309b2e756ae53fb39967 100644 (file)
--- a/model.h
+++ b/model.h
@@ -38,9 +38,11 @@ typedef std::list< ModelAction *, SnapshotAlloc<ModelAction *> > action_list_t;
 struct model_params {
        int maxreads;
        int maxfuturedelay;
+       bool yieldon;
        unsigned int fairwindow;
        unsigned int enabledcount;
        unsigned int bound;
+       unsigned int uninitvalue;
 
        /** @brief Maximum number of future values that can be sent to the same
         *  read */
@@ -176,7 +178,8 @@ private:
        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);
+       Thread * action_select_next_thread(const ModelAction *curr) const;
+       Thread * get_next_thread();
        bool set_latest_backtrack(ModelAction *act);
        ModelAction * get_next_backtrack();
        void reset_to_initial_state();
@@ -207,7 +210,7 @@ private:
        bool resolve_release_sequences(void *location, work_queue_t *work_queue);
        void add_future_value(const ModelAction *writer, ModelAction *reader);
 
-       ModelAction * new_uninitialized_action(void *location) const;
+       ModelAction * get_uninitialized_action(const ModelAction *curr) const;
 
        ModelAction *diverge;
        ModelAction *earliest_diverge;
@@ -276,7 +279,7 @@ private:
        bool is_feasible_prefix_ignore_relseq() const;
        bool is_infeasible() const;
        bool is_deadlocked() const;
-       bool check_deadlock(const Thread *t) const;
+       bool is_circular_wait(const Thread *t) const;
        bool is_complete_execution() const;
        bool have_bug_reports() const;
        void print_bugs() const;