Edits

[c11tester.git] / execution.h

diff --git a/execution.h b/execution.h
index 5e1b18700c248736d7657f04c625eaea1c18b277..6cdaeaf17a90b156e0bf14da5be134324cc4155d 100644 (file)
--- a/execution.h
+++ b/execution.h
@@ -66,7 +66,7 @@ public:
 
        bool check_action_enabled(ModelAction *curr);
 
-       bool assert_bug(const char *msg);
+       void assert_bug(const char *msg);
 
        bool have_bug_reports() const;
 
@@ -85,43 +85,31 @@ 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();
-
+       void collectActions();
+       modelclock_t get_curr_seq_num();
+#ifdef TLS
+       pthread_key_t getPthreadKey() {return pthreadkey;}
+#endif
        SNAPSHOTALLOC
 private:
        int get_execution_number() const;
-
-       ModelChecker *model;
-
-       struct model_params * params;
-
-       /** The scheduler to use: tracks the running/ready Threads */
-       Scheduler * const scheduler;
-
        bool mo_may_allow(const ModelAction *writer, const ModelAction *reader);
        bool should_wake_up(const ModelAction *curr, const Thread *thread) const;
        void wake_up_sleeping_actions(ModelAction *curr);
        modelclock_t get_next_seq_num();
-
        bool next_execution();
        bool initialize_curr_action(ModelAction **curr);
        bool process_read(ModelAction *curr, SnapVector<ModelAction *> * rf_set);
        void process_write(ModelAction *curr);
        bool process_fence(ModelAction *curr);
        bool process_mutex(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_action_to_lists(ModelAction *act, bool canprune);
        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;
@@ -130,28 +118,45 @@ private:
        ModelAction * get_last_unlock(ModelAction *curr) const;
        SnapVector<ModelAction *> * build_may_read_from(ModelAction *curr);
        ModelAction * process_rmw(ModelAction *curr);
-
-       bool r_modification_order(ModelAction *curr, const ModelAction *rf, SnapVector<const ModelAction *> *priorset, bool *canprune, bool check_only = false);
+       bool r_modification_order(ModelAction *curr, const ModelAction *rf, SnapVector<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*);
+       ClockVector * computeMinimalCV();
+       void removeAction(ModelAction *act);
+       void fixupLastAct(ModelAction *act);
+
+#ifdef TLS
+       pthread_key_t pthreadkey;
+#endif
+       ModelChecker *model;
+       struct model_params * params;
+
+       /** 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. */
+        * to a trace of all actions performed on the object.
+        * Used only for SC fences, unlocks, & wait.
+        */
        HashTable<const void *, action_list_t *, uintptr_t, 2> obj_map;
 
        /** Per-object list of actions. Maps an object (i.e., memory location)
         * to a trace of all actions performed on the object. */
        HashTable<const void *, action_list_t *, uintptr_t, 2> condvar_waiters_map;
 
+       /** Per-object list of actions that each thread performed. */
        HashTable<const void *, SnapVector<action_list_t> *, uintptr_t, 2> obj_thrd_map;
 
+       /** Per-object list of writes that each thread performed. */
        HashTable<const void *, SnapVector<action_list_t> *, uintptr_t, 2> obj_wr_thrd_map;
 
        HashTable<const void *, ModelAction *, uintptr_t, 4> obj_last_sc_map;
@@ -197,22 +202,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
-        * 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;
 };