X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=execution.h;h=9ad7469af605755094d7213b7118396c42b7c5d3;hp=7f63e6d99812c98f5732d35c52a1e04f8691ac17;hb=89ecd60fab0d93d6df6aa35e663ab67db860fa1d;hpb=50e0465f724dc182d5d7504004e93f1a1b4644b9 diff --git a/execution.h b/execution.h index 7f63e6d9..9ad7469a 100644 --- a/execution.h +++ b/execution.h @@ -10,23 +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; +#include "mypthread.h" +#include "mutex.h" +#include +#include "classlist.h" /** @brief Shorthand for a list of release sequence heads */ typedef ModelVector rel_heads_list_t; @@ -61,15 +52,14 @@ struct release_seq { class ModelExecution { public: ModelExecution(ModelChecker *m, - const struct model_params *params, - Scheduler *scheduler, - NodeStack *node_stack); + Scheduler *scheduler, + NodeStack *node_stack); ~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; #if SUPPORT_MOD_ORDER_DUMP @@ -79,7 +69,10 @@ public: 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,7 +82,6 @@ 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; @@ -106,15 +98,14 @@ public: 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;} SNAPSHOTALLOC private: @@ -122,17 +113,14 @@ private: ModelChecker *model; - const model_params * const params; + struct model_params * 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(); - bool promises_expired() const; + void set_bad_sc_read(); bool should_wake_up(const ModelAction *curr, const Thread *thread) const; void wake_up_sleeping_actions(ModelAction *curr); modelclock_t get_next_seq_num(); @@ -140,56 +128,35 @@ private: bool next_execution(); ModelAction * check_current_action(ModelAction *curr); bool initialize_curr_action(ModelAction **curr); - bool process_read(ModelAction *curr); + bool process_read(ModelAction *curr, ModelVector * rf_set); bool process_write(ModelAction *curr); bool 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); 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); - 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); 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); + ModelVector * build_may_read_from(ModelAction *curr); ModelAction * process_rmw(ModelAction *curr); template bool r_modification_order(ModelAction *curr, const rf_type *rf); - bool w_modification_order(ModelAction *curr, ModelVector *send_fv); + bool 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, struct release_seq *pending) const; - bool resolve_release_sequences(void *location, work_queue_t *work_queue); - void add_future_value(const ModelAction *writer, ModelAction *reader); - + bool release_seq_heads(const ModelAction *rf, rel_heads_list_t *release_heads) const; ModelAction * get_uninitialized_action(const ModelAction *curr) const; action_list_t action_trace; SnapVector thread_map; + SnapVector pthread_map; + uint32_t pthread_counter; /** Per-object list of actions. Maps an object (i.e., memory location) * to a trace of all actions performed on the object. */ @@ -200,8 +167,9 @@ private: HashTable condvar_waiters_map; HashTable *, uintptr_t, 4> obj_thrd_map; - SnapVector promises; - SnapVector futurevalues; + + HashTable mutex_map; + HashTable cond_map; /** * List of pending release sequences. Release sequences might be @@ -209,7 +177,6 @@ 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; @@ -239,7 +206,9 @@ private: */ CycleGraph * const mo_graph; + Fuzzer * fuzzer; + Thread * action_select_next_thread(const ModelAction *curr) const; }; -#endif /* __EXECUTION_H__ */ +#endif/* __EXECUTION_H__ */