X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=execution.h;h=31e9810ef40149fdd2003cc6fd78744cf9675b14;hp=3635657edc762879faefcfdd6c63895abec64c45;hb=055fb927ea688ec513508b0821e331558eea40d1;hpb=88fb5522811e0bd481ad3e60b70fe40fbc9c3e0f diff --git a/execution.h b/execution.h index 3635657e..31e9810e 100644 --- a/execution.h +++ b/execution.h @@ -10,27 +10,14 @@ #include "mymemory.h" #include "hashtable.h" -#include "workqueue.h" #include "config.h" #include "modeltypes.h" #include "stl-model.h" #include "params.h" - -/* Forward declaration */ -class Node; -class NodeStack; -class CycleGraph; -class Promise; -class Scheduler; -class Thread; -class ClockVector; -struct model_snapshot_members; -class ModelChecker; -struct bug_message; - -/** @brief Shorthand for a list of release sequence heads */ -typedef ModelVector rel_heads_list_t; -typedef SnapList action_list_t; +#include "mypthread.h" +#include "mutex.h" +#include +#include "classlist.h" struct PendingFutureValue { PendingFutureValue(ModelAction *writer, ModelAction *reader) : @@ -40,46 +27,34 @@ 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; -}; +#ifdef COLLECT_STAT +void print_atomic_accesses(); +#endif /** @brief The central structure for model-checking */ class ModelExecution { public: - ModelExecution(ModelChecker *m, - const struct model_params *params, - Scheduler *scheduler, - NodeStack *node_stack); + ModelExecution(ModelChecker *m, Scheduler *scheduler); ~ModelExecution(); - const struct model_params * get_params() const { return params; } + struct model_params * get_params() const { return params; } + void setParams(struct model_params * _params) {params = _params;} Thread * take_step(ModelAction *curr); - void fixup_release_sequences(); - void print_summary() const; + void print_summary(); + void print_tail(); #if SUPPORT_MOD_ORDER_DUMP - void dumpGraph(char *filename) const; + void dumpGraph(char *filename); #endif void add_thread(Thread *t); Thread * get_thread(thread_id_t tid) const; Thread * get_thread(const ModelAction *act) const; - int get_promise_number(const Promise *promise) const; + + uint32_t get_pthread_counter() { return pthread_counter; } + void incr_pthread_counter() { pthread_counter++; } + Thread * get_pthread(pthread_t pid); bool is_enabled(Thread *t) const; bool is_enabled(thread_id_t tid) const; @@ -89,129 +64,108 @@ public: ClockVector * get_cv(thread_id_t tid) const; ModelAction * get_parent_action(thread_id_t tid) const; - void check_promises_thread_disabled(); - 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); + 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_feasible_prefix_ignore_relseq() const; - bool is_infeasible() const; bool is_deadlocked() const; - bool is_yieldblocked() const; - bool too_many_steps() const; - - ModelAction * get_next_backtrack(); 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;} + ModelAction * check_current_action(ModelAction *curr); + 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; - - const model_params * const params; - - /** The scheduler to use: tracks the running/ready Threads */ - Scheduler * const scheduler; - - bool sleep_can_read_from(ModelAction *curr, const ModelAction *write); - bool thin_air_constraint_may_allow(const ModelAction *writer, const ModelAction *reader) const; - bool mo_may_allow(const ModelAction *writer, const ModelAction *reader); - bool promises_may_allow(const ModelAction *writer, const ModelAction *reader) const; - void set_bad_synchronization(); - void set_bad_sc_read(); - bool promises_expired() const; 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(); - ModelAction * check_current_action(ModelAction *curr); bool initialize_curr_action(ModelAction **curr); - bool process_read(ModelAction *curr); - bool process_write(ModelAction *curr, work_queue_t *work); - bool process_fence(ModelAction *curr); + bool process_read(ModelAction *curr, SnapVector * rf_set); + void process_write(ModelAction *curr); + void process_fence(ModelAction *curr); bool process_mutex(ModelAction *curr); - bool process_thread_action(ModelAction *curr); - void process_relseq_fixup(ModelAction *curr, work_queue_t *work_queue); - 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); - - template - bool check_recency(ModelAction *curr, const T *rf) const; - - template - bool should_read_instead(const ModelAction *curr, const T *rf, const U *other_rf) const; - - ModelAction * get_last_fence_conflict(ModelAction *act) const; - ModelAction * get_last_conflict(ModelAction *act) const; - void set_backtracking(ModelAction *act); - bool set_latest_backtrack(ModelAction *act); - Promise * pop_promise_to_resolve(const ModelAction *curr); - bool resolve_promise(ModelAction *curr, Promise *promise, - work_queue_t *work); - void compute_promises(ModelAction *curr); - void compute_relseq_breakwrites(ModelAction *curr); - - void check_promises(thread_id_t tid, ClockVector *old_cv, ClockVector *merge_cv); - void mo_check_promises(const ModelAction *act, bool is_read_check); - void thread_blocking_check_promises(Thread *blocker, Thread *waiting); - - void check_curr_backtracking(ModelAction *curr); - 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; - void 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); + void w_modification_order(ModelAction *curr); + 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; - template - bool r_modification_order(ModelAction *curr, const rf_type *rf); - bool w_modification_order(ModelAction *curr, ModelVector *send_fv); - 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, struct release_seq *pending) const; - void propagate_clockvector(ModelAction *acquire, work_queue_t *work); - bool resolve_release_sequences(void *location, work_queue_t *work_queue); - void add_future_value(const ModelAction *writer, ModelAction *reader); - bool check_coherence_promise(const ModelAction *write, const ModelAction *read); - ModelAction * get_uninitialized_action(const ModelAction *curr) const; + SnapVector thread_map; + SnapVector pthread_map; + uint32_t pthread_counter; action_list_t action_trace; - SnapVector thread_map; + /** 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; - HashTable *, uintptr_t, 4> obj_thrd_map; + /** Per-object list of actions that each thread performed. */ + HashTable *, uintptr_t, 2> obj_thrd_map; - /** - * @brief List of currently-pending promises - * - * Promises are sorted by the execution order of the read(s) which - * created them - */ - SnapVector promises; - SnapVector futurevalues; + /** Per-object list of writes that each thread performed. */ + HashTable *, uintptr_t, 2> obj_wr_thrd_map; + + HashTable obj_last_sc_map; + + + HashTable mutex_map; + HashTable cond_map; /** * List of pending release sequences. Release sequences might be @@ -219,11 +173,9 @@ private: * are established. Each entry in the list may only be partially * filled, depending on its pending status. */ - SnapVector pending_rel_seqs; 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 */ @@ -249,7 +201,11 @@ private: */ CycleGraph * const mo_graph; + Fuzzer * fuzzer; + Thread * action_select_next_thread(const ModelAction *curr) const; + + bool isfinished; }; -#endif /* __EXECUTION_H__ */ +#endif /* __EXECUTION_H__ */