X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=fe76d7f9e6b401b6e7c868b8fe6e515b39d79ba0;hb=6caada76d7318c7853dd334bccbfed0367c242ec;hp=8ef825f3485a9e10079c528a96644cc2385d487d;hpb=e7c0c2dc248559b307122db7923df35f7c6d957e;p=cdsspec-compiler.git diff --git a/model.h b/model.h index 8ef825f..fe76d7f 100644 --- a/model.h +++ b/model.h @@ -113,6 +113,7 @@ public: void remove_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; bool is_enabled(Thread *t) const; bool is_enabled(thread_id_t tid) const; @@ -126,7 +127,6 @@ public: ClockVector * get_cv(thread_id_t tid) const; ModelAction * get_parent_action(thread_id_t tid) const; void check_promises_thread_disabled(); - void mo_check_promises(const ModelAction *act, bool is_read_check); void check_promises(thread_id_t tid, ClockVector *old_cv, ClockVector *merge_cv); bool isfeasibleprefix() const; @@ -139,7 +139,7 @@ public: MEMALLOC private: /** The scheduler to use: tracks the running/ready Threads */ - Scheduler *scheduler; + 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); @@ -149,13 +149,14 @@ private: void set_bad_synchronization(); bool promises_expired() const; void execute_sleep_set(); + 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 second_part_of_rmw); + bool process_read(ModelAction *curr); bool process_write(ModelAction *curr); bool process_fence(ModelAction *curr); bool process_mutex(ModelAction *curr); @@ -167,16 +168,21 @@ private: Thread * take_step(ModelAction *curr); void check_recency(ModelAction *curr, const ModelAction *rf); - ModelAction * get_last_conflict(ModelAction *act); + ModelAction * get_last_fence_conflict(ModelAction *act) const; + ModelAction * get_last_conflict(ModelAction *act) const; void set_backtracking(ModelAction *act); Thread * get_next_thread(ModelAction *curr); bool set_latest_backtrack(ModelAction *act); ModelAction * get_next_backtrack(); void reset_to_initial_state(); - bool resolve_promises(ModelAction *curr); + int get_promise_to_resolve(const ModelAction *curr) const; + bool resolve_promise(ModelAction *curr, unsigned int promise_idx); void compute_promises(ModelAction *curr); void compute_relseq_breakwrites(ModelAction *curr); + 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_action(thread_id_t tid) const; @@ -184,7 +190,7 @@ private: 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_reads_from_past(ModelAction *curr); + void build_may_read_from(ModelAction *curr); ModelAction * process_rmw(ModelAction *curr); template @@ -202,24 +208,24 @@ private: ModelAction *earliest_diverge; ucontext_t system_context; - action_list_t *action_trace; - HashTable *thread_map; + action_list_t * const action_trace; + HashTable * const 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; + HashTable * const 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 *lock_waiters_map; + HashTable * const lock_waiters_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 * const condvar_waiters_map; - HashTable *, uintptr_t, 4 > *obj_thrd_map; - std::vector< Promise *, SnapshotAlloc > *promises; - std::vector< struct PendingFutureValue, SnapshotAlloc > *futurevalues; + HashTable *, uintptr_t, 4 > * const obj_thrd_map; + std::vector< Promise *, SnapshotAlloc > * const promises; + std::vector< struct PendingFutureValue, SnapshotAlloc > * const futurevalues; /** * List of pending release sequences. Release sequences might be @@ -227,15 +233,15 @@ private: * are established. Each entry in the list may only be partially * filled, depending on its pending status. */ - std::vector< struct release_seq *, SnapshotAlloc > *pending_rel_seqs; + std::vector< struct release_seq *, SnapshotAlloc > * const pending_rel_seqs; - std::vector< ModelAction *, SnapshotAlloc > *thrd_last_action; - std::vector< ModelAction *, SnapshotAlloc > *thrd_last_fence_release; - NodeStack *node_stack; + std::vector< ModelAction *, SnapshotAlloc > * const thrd_last_action; + std::vector< ModelAction *, SnapshotAlloc > * const thrd_last_fence_release; + NodeStack * const node_stack; /** Private data members that should be snapshotted. They are grouped * together for efficiency and maintainability. */ - struct model_snapshot_members *priv; + struct model_snapshot_members * const priv; /** A special model-checker Thread; used for associating with * model-checker-related ModelAcitons */ @@ -255,7 +261,7 @@ private: * such that a --> b means a was ordered before * b. */ - CycleGraph *mo_graph; + CycleGraph * const mo_graph; /** @brief The cumulative execution stats */ struct execution_stats stats;