X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=model.h;h=4b87b04a48a00263b9377c8e3b82549228e329f9;hp=56d86acc98e022bcb65d91cd9a922201b6d5f00f;hb=a575b5d5d2f0edab95e7e0ef8ca6e40b68e0bad9;hpb=8311cfbfaef6d71448cb04de647ef89cba3d3b98 diff --git a/model.h b/model.h index 56d86acc..4b87b04a 100644 --- a/model.h +++ b/model.h @@ -5,7 +5,6 @@ #ifndef __MODEL_H__ #define __MODEL_H__ -#include #include #include #include @@ -15,6 +14,7 @@ #include "workqueue.h" #include "config.h" #include "modeltypes.h" +#include "stl-model.h" /* Forward declaration */ class Node; @@ -27,9 +27,9 @@ class ClockVector; struct model_snapshot_members; /** @brief Shorthand for a list of release sequence heads */ -typedef std::vector< const ModelAction *, ModelAlloc > rel_heads_list_t; +typedef ModelVector rel_heads_list_t; -typedef std::list< ModelAction *, SnapshotAlloc > action_list_t; +typedef SnapList action_list_t; /** * Model checker parameter structure. Holds run-time configuration options for @@ -38,9 +38,11 @@ typedef std::list< ModelAction *, SnapshotAlloc > action_list_t; struct model_params { int maxreads; int maxfuturedelay; + bool yieldon; unsigned int fairwindow; unsigned int enabledcount; unsigned int bound; + unsigned int uninitvalue; /** @brief Maximum number of future values that can be sent to the same * read */ @@ -90,7 +92,7 @@ struct release_seq { /** @brief The head of the potential longest release sequence chain */ const ModelAction *release; /** @brief The write(s) that may break the release sequence */ - std::vector writes; + SnapVector writes; }; /** @brief The central structure for model-checking */ @@ -109,10 +111,9 @@ public: void dumpGraph(char *filename) const; #endif - void add_thread(Thread *t); - 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; @@ -141,6 +141,8 @@ private: /** The scheduler to use: tracks the running/ready Threads */ Scheduler * const scheduler; + 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); bool mo_may_allow(const ModelAction *writer, const ModelAction *reader); @@ -149,13 +151,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); @@ -166,17 +169,28 @@ private: Thread * take_step(ModelAction *curr); - void check_recency(ModelAction *curr, const ModelAction *rf); + 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 * get_next_thread(ModelAction *curr); + 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(); - 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,19 +198,19 @@ 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 bool r_modification_order(ModelAction *curr, const rf_type *rf); - bool w_modification_order(ModelAction *curr); + 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 * new_uninitialized_action(void *location) const; + ModelAction * get_uninitialized_action(const ModelAction *curr) const; ModelAction *diverge; ModelAction *earliest_diverge; @@ -217,9 +231,9 @@ private: * to a trace of all actions performed on the object. */ HashTable * const condvar_waiters_map; - HashTable *, uintptr_t, 4 > * const obj_thrd_map; - std::vector< Promise *, SnapshotAlloc > * const promises; - std::vector< struct PendingFutureValue, SnapshotAlloc > * const futurevalues; + HashTable *, uintptr_t, 4 > * const obj_thrd_map; + SnapVector * const promises; + SnapVector * const futurevalues; /** * List of pending release sequences. Release sequences might be @@ -227,10 +241,10 @@ private: * are established. Each entry in the list may only be partially * filled, depending on its pending status. */ - std::vector< struct release_seq *, SnapshotAlloc > * const pending_rel_seqs; + SnapVector * const pending_rel_seqs; - std::vector< ModelAction *, SnapshotAlloc > * const thrd_last_action; - std::vector< ModelAction *, SnapshotAlloc > * const thrd_last_fence_release; + SnapVector * const thrd_last_action; + SnapVector * const thrd_last_fence_release; NodeStack * const node_stack; /** Private data members that should be snapshotted. They are grouped @@ -265,6 +279,7 @@ private: bool is_feasible_prefix_ignore_relseq() const; bool is_infeasible() const; bool is_deadlocked() const; + bool is_circular_wait(const Thread *t) const; bool is_complete_execution() const; bool have_bug_reports() const; void print_bugs() const;