Fix NewFuzzer::selectWrite - check back edges

[c11tester.git] / execution.h

diff --git a/execution.h b/execution.h
index 622f17aafedaefe74d675f7eb42ca8be37eace61..1a38180728ef79bac50cd434aea0a5fcab2cf52b 100644 (file)
--- a/execution.h
+++ b/execution.h
@@ -61,13 +61,12 @@ public:
 
        ClockVector * get_cv(thread_id_t tid) const;
        ModelAction * get_parent_action(thread_id_t tid) const;
-       bool isfeasibleprefix() const;
 
        ModelAction * get_last_action(thread_id_t tid) const;
 
        bool check_action_enabled(ModelAction *curr);
 
-       bool assert_bug(const char *msg);
+       void assert_bug(const char *msg);
 
        bool have_bug_reports() const;
 
@@ -77,8 +76,6 @@ public:
        void set_assert();
        bool is_complete_execution() const;
 
-       void print_infeasibility(const char *prefix) const;
-       bool is_infeasible() const;
        bool is_deadlocked() const;
 
        action_list_t * get_action_trace() { return &action_trace; }
@@ -89,6 +86,7 @@ public:
        ModelAction * check_current_action(ModelAction *curr);
 
        SnapVector<func_id_list_t> * get_thrd_func_list() { return &thrd_func_list; }
+       SnapVector<uint32_t> * get_thrd_last_entered_func() { return &thrd_last_entered_func; }
        SnapVector< SnapList<action_list_t *> *> * get_thrd_func_act_lists() { return &thrd_func_act_lists; }
        bool isFinished() {return isfinished;}
        void setFinished() {isfinished = true;}
@@ -107,7 +105,6 @@ private:
        Scheduler * const scheduler;
 
        bool mo_may_allow(const ModelAction *writer, const ModelAction *reader);
-       void set_bad_synchronization();
        bool should_wake_up(const ModelAction *curr, const Thread *thread) const;
        void wake_up_sleeping_actions(ModelAction *curr);
        modelclock_t get_next_seq_num();
@@ -134,7 +131,7 @@ private:
        SnapVector<ModelAction *> * build_may_read_from(ModelAction *curr);
        ModelAction * process_rmw(ModelAction *curr);
 
-       bool r_modification_order(ModelAction *curr, const ModelAction *rf, SnapVector<const ModelAction *> *priorset, bool *canprune);
+       bool r_modification_order(ModelAction *curr, const ModelAction *rf, SnapVector<const ModelAction *> *priorset, bool *canprune, bool check_only = false);
        void w_modification_order(ModelAction *curr);
        ClockVector * get_hb_from_write(ModelAction *rf) const;
        ModelAction * get_uninitialized_action(ModelAction *curr) const;
@@ -147,15 +144,15 @@ private:
 
        /** Per-object list of actions. Maps an object (i.e., memory location)
         * to a trace of all actions performed on the object. */
-       HashTable<const void *, action_list_t *, uintptr_t, 4> obj_map;
+       HashTable<const void *, action_list_t *, uintptr_t, 2> obj_map;
 
        /** Per-object list of actions. Maps an object (i.e., memory location)
         * to a trace of all actions performed on the object. */
-       HashTable<const void *, action_list_t *, uintptr_t, 4> condvar_waiters_map;
+       HashTable<const void *, action_list_t *, uintptr_t, 2> condvar_waiters_map;
 
-       HashTable<const void *, SnapVector<action_list_t> *, uintptr_t, 4> obj_thrd_map;
+       HashTable<const void *, SnapVector<action_list_t> *, uintptr_t, 2> obj_thrd_map;
 
-       HashTable<const void *, SnapVector<action_list_t> *, uintptr_t, 4> obj_wr_thrd_map;
+       HashTable<const void *, SnapVector<action_list_t> *, uintptr_t, 2> obj_wr_thrd_map;
 
        HashTable<const void *, ModelAction *, uintptr_t, 4> obj_last_sc_map;
 
@@ -209,6 +206,7 @@ private:
         * This data structure is handled by ModelHistory
         */
        SnapVector<func_id_list_t> thrd_func_list;
+       SnapVector<uint32_t> thrd_last_entered_func;
 
        /* Keeps track of atomic actions that thread i has performed in some
         * function. Index of SnapVector is thread id. SnapList simulates