Get rid of uninitialized actions and just use non-atomic writes instead

[c11tester.git] / execution.h

diff --git a/execution.h b/execution.h
index 356c59a27f604fcbb5c618495f33ec47ca148ba8..854513cd4b16cc4c6bc74ad0916fe6d108ea6a78 100644 (file)
--- a/execution.h
+++ b/execution.h
@@ -85,9 +85,6 @@ 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;}
 
@@ -111,7 +108,6 @@ private:
        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);
@@ -124,8 +120,8 @@ private:
        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;
        ModelAction * convertNonAtomicStore(void*);
+       void removeAction(ModelAction *act);
 
 #ifdef TLS
        pthread_key_t pthreadkey;
@@ -135,13 +131,14 @@ private:
 
        /** The scheduler to use: tracks the running/ready Threads */
        Scheduler * const scheduler;
-       action_list_t action_trace;
 
 
        SnapVector<Thread *> thread_map;
        SnapVector<Thread *> pthread_map;
        uint32_t pthread_counter;
 
+       action_list_t action_trace;
+
 
        /** Per-object list of actions. Maps an object (i.e., memory location)
         * to a trace of all actions performed on the object.
@@ -204,20 +201,6 @@ private:
        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;
 };