bug fix

[c11tester.git] / execution.h

diff --git a/execution.h b/execution.h
index 21b152b582c2f3ac32164975ecf267b8ebf9489e..22f694c9c193951dd9cc2405c834c298e7fee40d 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);
@@ -68,7 +68,6 @@ public:
        bool check_action_enabled(ModelAction *curr);
 
        bool assert_bug(const char *msg);
-       bool assert_race(const char *msg);
 
        bool have_bug_reports() const;
        bool have_fatal_bug_reports() const;
@@ -90,8 +89,10 @@ 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<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; }
+       bool isFinished() {return isfinished;}
+       void setFinished() {isfinished = true;}
 
        SNAPSHOTALLOC
 private:
@@ -117,11 +118,12 @@ private:
        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_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;
@@ -134,6 +136,7 @@ private:
        void w_modification_order(ModelAction *curr);
        ClockVector * get_hb_from_write(ModelAction *rf) const;
        ModelAction * get_uninitialized_action(ModelAction *curr) const;
+       ModelAction * convertNonAtomicStore(void*);
 
        action_list_t action_trace;
        SnapVector<Thread *> thread_map;
@@ -196,21 +199,22 @@ private:
 
        Thread * action_select_next_thread(const ModelAction *curr) const;
 
-       /* thrd_func_list stores a list of function ids for each thread. 
+       /* 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 
+        * 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<func_id_list_t> thrd_func_list;
 
        /* Keeps track of atomic actions that thread i has performed in some
-        * function. Index of SnapVector is thread id. SnapList simulates 
-        * the call stack. 
+        * 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;
+       bool isfinished;
 };
 
 #endif /* __EXECUTION_H__ */