X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=execution.h;h=31e9810ef40149fdd2003cc6fd78744cf9675b14;hp=5e1b18700c248736d7657f04c625eaea1c18b277;hb=25d73096cfc14c655f94b01bb235cc5efd1d5696;hpb=cc6b96adbe8bc76d49c71df36de6b9ff99f373dd diff --git a/execution.h b/execution.h index 5e1b1870..31e9810e 100644 --- a/execution.h +++ b/execution.h @@ -19,8 +19,6 @@ #include #include "classlist.h" -typedef SnapList action_list_t; - struct PendingFutureValue { PendingFutureValue(ModelAction *writer, ModelAction *reader) : writer(writer), reader(reader) @@ -29,6 +27,10 @@ struct PendingFutureValue { ModelAction *reader; }; +#ifdef COLLECT_STAT +void print_atomic_accesses(); +#endif + /** @brief The central structure for model-checking */ class ModelExecution { public: @@ -41,6 +43,7 @@ public: Thread * take_step(ModelAction *curr); void print_summary(); + void print_tail(); #if SUPPORT_MOD_ORDER_DUMP void dumpGraph(char *filename); #endif @@ -66,7 +69,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 +88,30 @@ public: HashTable * getMutexMap() {return &mutex_map;} ModelAction * check_current_action(ModelAction *curr); - SnapVector * get_thrd_func_list() { return &thrd_func_list; } - SnapVector * get_thrd_last_entered_func() { return &thrd_last_entered_func; } - SnapVector< SnapList *> * 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 * rf_set); void process_write(ModelAction *curr); - bool process_fence(ModelAction *curr); + void 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,29 +120,46 @@ private: ModelAction * get_last_unlock(ModelAction *curr) const; SnapVector * build_may_read_from(ModelAction *curr); ModelAction * process_rmw(ModelAction *curr); - - bool r_modification_order(ModelAction *curr, const ModelAction *rf, SnapVector *priorset, bool *canprune, bool check_only = false); + bool r_modification_order(ModelAction *curr, const ModelAction *rf, SnapVector *priorset, bool *canprune); 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_map; SnapVector 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. */ - HashTable obj_map; + * to a trace of all actions performed on the object. + * Used only for SC fences, unlocks, & wait. + */ + HashTable 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 condvar_waiters_map; + HashTable condvar_waiters_map; + /** Per-object list of actions that each thread performed. */ HashTable *, uintptr_t, 2> obj_thrd_map; - HashTable *, uintptr_t, 2> obj_wr_thrd_map; + /** Per-object list of writes that each thread performed. */ + HashTable *, uintptr_t, 2> obj_wr_thrd_map; HashTable obj_last_sc_map; @@ -197,22 +204,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 thrd_func_list; - SnapVector 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 *> thrd_func_act_lists; bool isfinished; };