X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;ds=sidebyside;f=execution.h;h=6cdaeaf17a90b156e0bf14da5be134324cc4155d;hb=7719c6dc7e1a6dade8dfa022f3c9e19853f3e89f;hp=f79b2f9eadd5112eafe0b93abf7bdd8859fb0222;hpb=abb082e1c2672bb79b6c590adfb12c6de5b2f215;p=c11tester.git diff --git a/execution.h b/execution.h index f79b2f9e..6cdaeaf1 100644 --- a/execution.h +++ b/execution.h @@ -19,8 +19,6 @@ #include #include "classlist.h" -/** @brief Shorthand for a list of release sequence heads */ -typedef ModelVector rel_heads_list_t; typedef SnapList action_list_t; struct PendingFutureValue { @@ -31,29 +29,10 @@ struct PendingFutureValue { ModelAction *reader; }; -/** @brief Records information regarding a single pending release sequence */ -struct release_seq { - /** @brief The acquire operation */ - ModelAction *acquire; - /** @brief The read operation that may read from a release sequence; - * may be the same as acquire, or else an earlier action in the same - * thread (i.e., when 'acquire' is a fence-acquire) */ - const ModelAction *read; - /** @brief The head of the RMW chain from which 'read' reads; may be - * equal to 'release' */ - const ModelAction *rf; - /** @brief The head of the potential longest release sequence chain */ - const ModelAction *release; - /** @brief The write(s) that may break the release sequence */ - SnapVector writes; -}; - /** @brief The central structure for model-checking */ class ModelExecution { public: - ModelExecution(ModelChecker *m, - Scheduler *scheduler, - NodeStack *node_stack); + ModelExecution(ModelChecker *m, Scheduler *scheduler); ~ModelExecution(); struct model_params * get_params() const { return params; } @@ -61,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); @@ -82,22 +61,21 @@ public: ClockVector * get_cv(thread_id_t tid) const; ModelAction * get_parent_action(thread_id_t tid) const; - bool isfeasibleprefix() const; ModelAction * get_last_action(thread_id_t tid) const; bool check_action_enabled(ModelAction *curr); - bool assert_bug(const char *msg); + void assert_bug(const char *msg); + bool have_bug_reports() const; + SnapVector * get_bugs() const; bool has_asserted() const; void set_assert(); bool is_complete_execution() const; - void print_infeasibility(const char *prefix) const; - bool is_infeasible() const; bool is_deadlocked() const; action_list_t * get_action_trace() { return &action_trace; } @@ -107,65 +85,82 @@ public: HashTable * getMutexMap() {return &mutex_map;} ModelAction * check_current_action(ModelAction *curr); - SnapVector * get_thrd_func_list() { return &thrd_func_list; } - SnapVector< SnapList *> * get_thrd_func_inst_lists() { return &thrd_func_inst_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); - void set_bad_synchronization(); 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); - void process_read(ModelAction *curr, SnapVector * rf_set); + bool process_read(ModelAction *curr, SnapVector * rf_set); void process_write(ModelAction *curr); bool process_fence(ModelAction *curr); bool process_mutex(ModelAction *curr); - - bool process_thread_action(ModelAction *curr); - bool read_from(ModelAction *act, const ModelAction *rf); + 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_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; ModelAction * get_last_seq_cst_write(ModelAction *curr) const; ModelAction * get_last_seq_cst_fence(thread_id_t tid, const ModelAction *before_fence) const; ModelAction * get_last_unlock(ModelAction *curr) const; - SnapVector * build_may_read_from(ModelAction *curr); + 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 r_modification_order(ModelAction *curr, const ModelAction *rf, SnapVector *priorset, bool *canprune, bool check_only = false); void w_modification_order(ModelAction *curr); - void get_release_seq_heads(ModelAction *acquire, ModelAction *read, rel_heads_list_t *release_heads); - bool release_seq_heads(const ModelAction *rf, rel_heads_list_t *release_heads) const; - ModelAction * get_uninitialized_action(const ModelAction *curr) const; + ClockVector * get_hb_from_write(ModelAction *rf) 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; + + /** Per-object list of writes that each thread performed. */ + HashTable *, uintptr_t, 2> obj_wr_thrd_map; + + HashTable obj_last_sc_map; - HashTable *, uintptr_t, 4> obj_thrd_map; HashTable mutex_map; HashTable cond_map; @@ -179,7 +174,6 @@ private: SnapVector thrd_last_action; SnapVector thrd_last_fence_release; - NodeStack * const node_stack; /** A special model-checker Thread; used for associating with * model-checker-related ModelAcitons */ @@ -209,21 +203,7 @@ private: 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 - * - * This data structure is handled by ModelHistory - */ - 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. - * - * This data structure is handled by ModelHistory - */ - SnapVector< SnapList< func_inst_list_t *> *> thrd_func_inst_lists; + bool isfinished; }; #endif /* __EXECUTION_H__ */