X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=model.h;h=dd5df93b0d9466747330160bd9437b569529bd90;hp=3d1385596751c1ba13fd7016c8df2690921962d1;hb=92dd847e38280a3bb0ec93781c47173a3848f1d7;hpb=5d806b4bc80d6df106c78f47b336ef9d2aad7f3d diff --git a/model.h b/model.h index 3d13855..dd5df93 100644 --- a/model.h +++ b/model.h @@ -10,7 +10,6 @@ #include "mymemory.h" #include "hashtable.h" -#include "workqueue.h" #include "config.h" #include "modeltypes.h" #include "stl-model.h" @@ -26,10 +25,9 @@ class Scheduler; class Thread; class ClockVector; class TraceAnalysis; -struct model_snapshot_members; +class ModelExecution; +class ModelAction; -/** @brief Shorthand for a list of release sequence heads */ -typedef ModelVector rel_heads_list_t; typedef SnapList action_list_t; /** @brief Model checker execution stats */ @@ -41,31 +39,6 @@ struct execution_stats { int num_redundant; /**< @brief Number of redundant, aborted executions */ }; -struct PendingFutureValue { - PendingFutureValue(ModelAction *writer, ModelAction *reader) : - writer(writer), reader(reader) - { } - const ModelAction *writer; - 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 ModelChecker { public: @@ -77,10 +50,7 @@ public: /** @returns the context for the main model-checking system thread */ ucontext_t * get_system_context() { return &system_context; } - void print_summary() const; -#if SUPPORT_MOD_ORDER_DUMP - void dumpGraph(char *filename) const; -#endif + const ModelExecution * get_execution() const { return execution; } Thread * get_thread(thread_id_t tid) const; Thread * get_thread(const ModelAction *act) const; @@ -95,10 +65,7 @@ public: void switch_from_master(Thread *thread); uint64_t switch_to_master(ModelAction *act); - 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; bool assert_bug(const char *msg, ...); void assert_user_bug(const char *msg); @@ -115,149 +82,29 @@ public: private: /** The scheduler to use: tracks the running/ready Threads */ Scheduler * const scheduler; + NodeStack * const node_stack; + ModelExecution *execution; - void add_thread(Thread *t); - - 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; - bool has_asserted() const; - void set_assert(); - 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 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); - bool check_action_enabled(ModelAction *curr); - - Thread * take_step(ModelAction *curr); bool should_terminate_execution(); - 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); - Thread * action_select_next_thread(const ModelAction *curr) const; Thread * get_next_thread(); - bool set_latest_backtrack(ModelAction *act); - ModelAction * get_next_backtrack(); void reset_to_initial_state(); - 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); - 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); - 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); - - ModelAction * get_uninitialized_action(const ModelAction *curr) const; ModelAction *diverge; ModelAction *earliest_diverge; ucontext_t system_context; - 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 * 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 * const condvar_waiters_map; - - HashTable *, uintptr_t, 4 > * const obj_thrd_map; - SnapVector * const promises; - SnapVector * const futurevalues; - - /** - * List of pending release sequences. Release sequences might be - * determined lazily as promises are fulfilled and modification orders - * are established. Each entry in the list may only be partially - * filled, depending on its pending status. - */ - SnapVector * const pending_rel_seqs; - SnapVector * const thrd_last_action; - SnapVector * const thrd_last_fence_release; - NodeStack * const node_stack; ModelVector * trace_analyses; - - /** Private data members that should be snapshotted. They are grouped - * together for efficiency and maintainability. */ - struct model_snapshot_members * const priv; - - /** A special model-checker Thread; used for associating with - * model-checker-related ModelAcitons */ - Thread *model_thread; - - /** - * @brief The modification order graph - * - * A directed acyclic graph recording observations of the modification - * order on all the atomic objects in the system. This graph should - * never contain any cycles, as that represents a violation of the - * memory model (total ordering). This graph really consists of many - * disjoint (unconnected) subgraphs, each graph corresponding to a - * separate ordering on a distinct object. - * - * The edges in this graph represent the "ordered before" relation, - * such that a --> b means a was ordered before - * b. - */ - CycleGraph * const mo_graph; - /** @brief The cumulative execution stats */ struct execution_stats stats; void record_stats(); void run_trace_analyses(); - void print_infeasibility(const char *prefix) const; - bool is_feasible_prefix_ignore_relseq() const; - bool is_infeasible() const; - bool is_deadlocked() const; - bool too_many_steps() const; - bool is_complete_execution() const; - bool have_bug_reports() const; void print_bugs() const; void print_execution(bool printbugs) const; void print_stats() const;