X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=model.h;h=12ec06c060a999e256dfb57ea0088c97a09f81c3;hp=5f62ff835df1d1e9df13dde2e8cd204d2bafd9d2;hb=2b004336a919f74a5ca8f6d87ad5414360a949c7;hpb=d63f01d45efd1aedb8aafb7dce7e7c6375fec9e7 diff --git a/model.h b/model.h index 5f62ff83..12ec06c0 100644 --- a/model.h +++ b/model.h @@ -5,27 +5,31 @@ #ifndef __MODEL_H__ #define __MODEL_H__ -#include #include -#include +#include #include "mymemory.h" -#include "action.h" #include "hashtable.h" #include "workqueue.h" #include "config.h" #include "modeltypes.h" +#include "stl-model.h" +#include "context.h" /* Forward declaration */ +class Node; class NodeStack; class CycleGraph; class Promise; class Scheduler; class Thread; +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 SnapList action_list_t; /** * Model checker parameter structure. Holds run-time configuration options for @@ -34,9 +38,11 @@ typedef std::vector< const ModelAction *, ModelAlloc > rel_ 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 */ @@ -67,8 +73,11 @@ struct execution_stats { }; struct PendingFutureValue { - ModelAction *writer; - ModelAction *act; + PendingFutureValue(ModelAction *writer, ModelAction *reader) : + writer(writer), reader(reader) + { } + const ModelAction *writer; + ModelAction *reader; }; /** @brief Records information regarding a single pending release sequence */ @@ -85,7 +94,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 */ @@ -104,10 +113,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(ModelAction *act) 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; @@ -116,11 +124,11 @@ public: unsigned int get_num_threads() const; Thread * get_current_thread() const; + 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(); - void mo_check_promises(thread_id_t tid, const ModelAction *write); void check_promises(thread_id_t tid, ClockVector *old_cv, ClockVector *merge_cv); bool isfeasibleprefix() const; @@ -133,24 +141,27 @@ public: MEMALLOC private: /** The scheduler to use: tracks the running/ready Threads */ - Scheduler *scheduler; + 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 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(); - void set_current_action(ModelAction *act); - Thread * check_current_action(ModelAction *curr); + 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); @@ -159,19 +170,30 @@ private: bool read_from(ModelAction *act, const ModelAction *rf); bool check_action_enabled(ModelAction *curr); - bool take_step(ModelAction *curr); + Thread * take_step(ModelAction *curr); + + 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; - 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); + 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); + 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 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; @@ -179,39 +201,38 @@ 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); - void post_r_modification_order(ModelAction *curr, const ModelAction *rf); - bool r_modification_order(ModelAction *curr, const ModelAction *rf); - bool w_modification_order(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 * new_uninitialized_action(void *location) const; + ModelAction * get_uninitialized_action(const ModelAction *curr) const; ModelAction *diverge; ModelAction *earliest_diverge; ucontext_t system_context; - action_list_t *action_trace; - HashTable *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; + 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 *lock_waiters_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 *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; + SnapVector * const promises; + SnapVector * const futurevalues; /** * List of pending release sequences. Release sequences might be @@ -219,15 +240,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; + SnapVector * const pending_rel_seqs; - std::vector< ModelAction *, SnapshotAlloc > *thrd_last_action; - std::vector< ModelAction *, SnapshotAlloc > *thrd_last_fence_release; - NodeStack *node_stack; + 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 * 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 */ @@ -247,14 +268,14 @@ 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; void record_stats(); + void print_infeasibility(const char *prefix) const; bool is_feasible_prefix_ignore_relseq() const; - bool is_infeasible_ignoreRMW() const; bool is_infeasible() const; bool is_deadlocked() const; bool is_complete_execution() const;