Add an exit node in predicate trees

[c11tester.git] / execution.h

diff --git a/execution.h b/execution.h
index c87a20fe2eb930c04310b9c9efa67cd0f2c3d0c4..b35113fd60aff8c8e8f3a49f838f3760104986b5 100644 (file)
--- a/execution.h
+++ b/execution.h
@@ -32,7 +32,7 @@ struct PendingFutureValue {
 /** @brief The central structure for model-checking */
 class ModelExecution {
 public:
-       ModelExecution(ModelChecker *m, Scheduler *scheduler, NodeStack *node_stack);
+       ModelExecution(ModelChecker *m, Scheduler *scheduler);
        ~ModelExecution();
 
        struct model_params * get_params() const { return params; }
@@ -40,9 +40,9 @@ public:
 
        Thread * take_step(ModelAction *curr);
 
-       void print_summary() const;
+       void print_summary();
 #if SUPPORT_MOD_ORDER_DUMP
-       void dumpGraph(char *filename) const;
+       void dumpGraph(char *filename);
 #endif
 
        void add_thread(Thread *t);
@@ -68,7 +68,9 @@ public:
        bool check_action_enabled(ModelAction *curr);
 
        bool assert_bug(const char *msg);
+
        bool have_bug_reports() const;
+
        SnapVector<bug_message *> * get_bugs() const;
 
        bool has_asserted() const;
@@ -86,6 +88,14 @@ public:
        HashTable<pthread_mutex_t *, cdsc::snapmutex *, uintptr_t, 4> * getMutexMap() {return &mutex_map;}
        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;}
+
+       void restore_last_seq_num();
+
        SNAPSHOTALLOC
 private:
        int get_execution_number() const;
@@ -105,16 +115,19 @@ private:
 
        bool next_execution();
        bool initialize_curr_action(ModelAction **curr);
-       void process_read(ModelAction *curr, SnapVector<ModelAction *> * rf_set);
+       bool process_read(ModelAction *curr, SnapVector<ModelAction *> * rf_set);
        void process_write(ModelAction *curr);
        bool process_fence(ModelAction *curr);
        bool process_mutex(ModelAction *curr);
 
-       bool process_thread_action(ModelAction *curr);
+       void process_thread_action(ModelAction *curr);
        void read_from(ModelAction *act, ModelAction *rf);
        bool synchronize(const ModelAction *first, ModelAction *second);
 
+       void add_uninit_action_to_lists(ModelAction *act);
        void add_action_to_lists(ModelAction *act);
+       void add_normal_write_to_lists(ModelAction *act);
+       void add_write_to_lists(ModelAction *act);
        ModelAction * get_last_fence_release(thread_id_t tid) const;
        ModelAction * get_last_seq_cst_write(ModelAction *curr) const;
        ModelAction * get_last_seq_cst_fence(thread_id_t tid, const ModelAction *before_fence) const;
@@ -125,7 +138,8 @@ private:
        bool r_modification_order(ModelAction *curr, const ModelAction *rf, SnapVector<const ModelAction *> *priorset, bool *canprune);
        void w_modification_order(ModelAction *curr);
        ClockVector * get_hb_from_write(ModelAction *rf) const;
-       ModelAction * get_uninitialized_action(const ModelAction *curr) const;
+       ModelAction * get_uninitialized_action(ModelAction *curr) const;
+       ModelAction * convertNonAtomicStore(void*);
 
        action_list_t action_trace;
        SnapVector<Thread *> thread_map;
@@ -140,7 +154,12 @@ private:
         * to a trace of all actions performed on the object. */
        HashTable<const void *, action_list_t *, uintptr_t, 4> condvar_waiters_map;
 
-       HashTable<void *, SnapVector<action_list_t> *, uintptr_t, 4> obj_thrd_map;
+       HashTable<const void *, SnapVector<action_list_t> *, uintptr_t, 4> obj_thrd_map;
+
+       HashTable<const void *, SnapVector<action_list_t> *, uintptr_t, 4> obj_wr_thrd_map;
+
+       HashTable<const void *, ModelAction *, uintptr_t, 4> obj_last_sc_map;
+
 
        HashTable<pthread_mutex_t *, cdsc::snapmutex *, uintptr_t, 4> mutex_map;
        HashTable<pthread_cond_t *, cdsc::snapcondition_variable *, uintptr_t, 4> cond_map;
@@ -154,7 +173,6 @@ private:
 
        SnapVector<ModelAction *> thrd_last_action;
        SnapVector<ModelAction *> thrd_last_fence_release;
-       NodeStack * const node_stack;
 
        /** A special model-checker Thread; used for associating with
         *  model-checker-related ModelAcitons */
@@ -183,6 +201,23 @@ private:
        Fuzzer * fuzzer;
 
        Thread * action_select_next_thread(const ModelAction *curr) const;
+       bool paused_by_fuzzer(const ModelAction * act) const;
+
+       /* thrd_func_list stores a list of function ids for each thread.
+        * Each element in thrd_func_list stores the functions that
+        * thread i has entered and yet to exit from
+        *
+        * 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
+        * the call stack.
+        */
+       SnapVector< SnapList<action_list_t *> *> thrd_func_act_lists;
+       bool isfinished;
 };
 
 #endif /* __EXECUTION_H__ */