Add an exit node in predicate trees

[c11tester.git] / execution.h

diff --git a/execution.h b/execution.h
index 513a92a70700528b72bac48511f11287d437ebfd..b35113fd60aff8c8e8f3a49f838f3760104986b5 100644 (file)
--- a/execution.h
+++ b/execution.h
@@ -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);
@@ -70,7 +70,6 @@ public:
        bool assert_bug(const char *msg);
 
        bool have_bug_reports() const;
-       bool have_fatal_bug_reports() const;
 
        SnapVector<bug_message *> * get_bugs() const;
 
@@ -89,8 +88,13 @@ 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< SnapList<func_inst_list_t *> *> * get_thrd_func_inst_lists() { return &thrd_func_inst_lists; }
+       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:
@@ -111,15 +115,16 @@ 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);
@@ -196,6 +201,7 @@ 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
@@ -203,29 +209,15 @@ private:
         *
         * This data structure is handled by ModelHistory
         */
-       SnapVector< func_id_list_t * > thrd_func_list;
+       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.
-        *
-        * This data structure is handled by ModelHistory
         */
-       SnapVector< SnapList< func_inst_list_t *> *> thrd_func_inst_lists;
-
-#ifdef TLS
-public:
-       char * getTLSBase() {return tls_base;}
-       uintptr_t getTLSAddr() {return tls_addr;}
-       uintptr_t getTLSSize() {if (!tls_base) initTLS();return tls_size;}
-       uintptr_t getThdDescSize() {return thd_desc_size;}
-private:
-       void initTLS();
-       char * tls_base;
-       uintptr_t tls_addr;
-       uintptr_t tls_size;
-       uintptr_t thd_desc_size;
-#endif
+       SnapVector< SnapList<action_list_t *> *> thrd_func_act_lists;
+       bool isfinished;
 };
 
 #endif /* __EXECUTION_H__ */