fix git conflict

[c11tester.git] / execution.h

diff --git a/execution.h b/execution.h
index fa2b78b8a282fda6234f3090a00bda968104cc54..0a36d31cab50f5532f8171c9e3f83935ab39b840 100644 (file)
--- a/execution.h
+++ b/execution.h
@@ -107,6 +107,8 @@ 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; }
+
        SNAPSHOTALLOC
 private:
        int get_execution_number() const;
@@ -205,6 +207,12 @@ private:
        Fuzzer * fuzzer;
 
        Thread * action_select_next_thread(const ModelAction *curr) 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 */
+       SnapVector< func_id_list_t * > thrd_func_list;
+
 };
 
 #endif /* __EXECUTION_H__ */