X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=execution.h;h=622f17aafedaefe74d675f7eb42ca8be37eace61;hb=9c8fe6c437d1a43d2d6170ea2842f52555b62a11;hp=b78837fc7219bd77dcea34744ff6214fb5fecaa6;hpb=5d0368dd546d03580ae69f8058a3a4fdc31de83b;p=c11tester.git diff --git a/execution.h b/execution.h index b78837fc..622f17aa 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); @@ -84,13 +63,14 @@ public: ModelAction * get_parent_action(thread_id_t tid) const; bool isfeasibleprefix() const; - action_list_t * get_actions_on_obj(void * obj, thread_id_t tid) const; ModelAction * get_last_action(thread_id_t tid) const; bool check_action_enabled(ModelAction *curr); bool assert_bug(const char *msg); + bool have_bug_reports() const; + SnapVector * get_bugs() const; bool has_asserted() const; @@ -104,8 +84,16 @@ public: action_list_t * get_action_trace() { return &action_trace; } Fuzzer * getFuzzer(); CycleGraph * const get_mo_graph() { return mo_graph; } - HashTable * getCondMap() {return &cond_map;} - HashTable * getMutexMap() {return &mutex_map;} + HashTable * getCondMap() {return &cond_map;} + 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_act_lists() { return &thrd_func_act_lists; } + bool isFinished() {return isfinished;} + void setFinished() {isfinished = true;} + + void restore_last_seq_num(); SNAPSHOTALLOC private: @@ -125,18 +113,20 @@ private: modelclock_t get_next_seq_num(); bool next_execution(); - ModelAction * check_current_action(ModelAction *curr); 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_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); 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; @@ -144,11 +134,11 @@ private: SnapVector * build_may_read_from(ModelAction *curr); ModelAction * process_rmw(ModelAction *curr); - bool r_modification_order(ModelAction *curr, const ModelAction *rf, SnapVector *priorset); + bool r_modification_order(ModelAction *curr, const ModelAction *rf, SnapVector *priorset, bool *canprune); 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 * get_uninitialized_action(ModelAction *curr) const; + ModelAction * convertNonAtomicStore(void*); action_list_t action_trace; SnapVector thread_map; @@ -163,10 +153,15 @@ private: * to a trace of all actions performed on the object. */ HashTable condvar_waiters_map; - HashTable *, uintptr_t, 4> obj_thrd_map; + HashTable *, uintptr_t, 4> obj_thrd_map; - HashTable mutex_map; - HashTable cond_map; + HashTable *, uintptr_t, 4> obj_wr_thrd_map; + + HashTable obj_last_sc_map; + + + HashTable mutex_map; + HashTable cond_map; /** * List of pending release sequences. Release sequences might be @@ -177,7 +172,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 */ @@ -206,6 +200,22 @@ 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; + + /* 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; }; #endif /* __EXECUTION_H__ */