changes

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index 7d5489eaadd5fc0c6c3f6995831122830ba0c44b..74e3b068c39f356570daf491c3715865a1382d38 100644 (file)
--- a/model.h
+++ b/model.h
@@ -42,8 +42,6 @@ public:
        /** Prints an execution summary with trace information. */
        void print_summary();
 
-       Thread * schedule_next_thread();
-
        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)); }
@@ -57,6 +55,7 @@ public:
 
        int switch_to_master(ModelAction *act);
        ClockVector * get_cv(thread_id_t tid);
+       ModelAction * get_parent_action(thread_id_t tid);
        bool next_execution();
        bool isfeasible();
        bool isfinalfeasible();
@@ -65,12 +64,16 @@ public:
                        std::vector<const ModelAction *> *release_heads);
 
        void finish_execution();
+       bool isfeasibleprefix();
+       void set_assert() {asserted=true;}
 
        MEMALLOC
 private:
        /** The scheduler to use: tracks the running/ready Threads */
        Scheduler *scheduler;
 
+       bool has_asserted() {return asserted;}
+       void reset_asserted() {asserted=false;}
        int next_thread_id;
        modelclock_t used_sequence_numbers;
        int num_executions;
@@ -84,13 +87,13 @@ private:
         * @param act The ModelAction created by the user-thread action
         */
        void set_current_action(ModelAction *act) { current_action = act; }
-       void check_current_action();
+       Thread * check_current_action(ModelAction *curr);
 
        bool take_step();
 
        ModelAction * get_last_conflict(ModelAction *act);
        void set_backtracking(ModelAction *act);
-       thread_id_t get_next_replay_thread();
+       Thread * get_next_replay_thread();
        ModelAction * get_next_backtrack();
        void reset_to_initial_state();
        bool resolve_promises(ModelAction *curr);
@@ -98,7 +101,6 @@ private:
 
        void add_action_to_lists(ModelAction *act);
        ModelAction * get_last_action(thread_id_t tid);
-       ModelAction * get_parent_action(thread_id_t tid);
        ModelAction * get_last_seq_cst(const void *location);
        void build_reads_from_past(ModelAction *curr);
        ModelAction * process_rmw(ModelAction *curr);
@@ -107,10 +109,11 @@ private:
        bool w_modification_order(ModelAction *curr);
        bool release_seq_head(const ModelAction *rf,
                        std::vector<const ModelAction *> *release_heads) const;
+       bool resolve_release_sequences(void *location);
 
        ModelAction *current_action;
        ModelAction *diverge;
-       thread_id_t nextThread;
+       Thread *nextThread;
 
        ucontext_t system_context;
        action_list_t *action_trace;
@@ -139,7 +142,7 @@ private:
        /**
         * @brief The modification order graph
         *
-        * A direceted acyclic graph recording observations of the modification
+        * A directed acyclic graph recording observations of the modification
         * order on all the atomic objects in the system. This graph should
         * never contain any cycles, as that represents a violation of the
         * memory model (total ordering). This graph really consists of many
@@ -151,8 +154,8 @@ private:
         * <tt>b</tt>.
         */
        CycleGraph *mo_graph;
-
        bool failed_promise;
+       bool asserted;
 };
 
 extern ModelChecker *model;