X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=d0043a1f88b1990de8e0fcdee27e21baa387ccd7;hb=d2cbbe4ce6d8f6e1aa23b8fe639ed58edf1789b7;hp=23c42ebb199a6ce30b5859b80ca8d5537038d0a3;hpb=081ec029e06a68012f1a3fd119671148bfac9605;p=model-checker.git diff --git a/model.h b/model.h index 23c42eb..d0043a1 100644 --- a/model.h +++ b/model.h @@ -11,19 +11,18 @@ #include #include "mymemory.h" -#include "libthreads.h" -#include "threads.h" #include "action.h" -#include "clockvector.h" #include "hashtable.h" #include "workqueue.h" #include "config.h" +#include "modeltypes.h" /* Forward declaration */ class NodeStack; class CycleGraph; class Promise; class Scheduler; +class Thread; /** @brief Shorthand for a list of release sequence heads */ typedef std::vector< const ModelAction *, ModelAlloc > rel_heads_list_t; @@ -37,11 +36,11 @@ struct model_params { int maxfuturedelay; unsigned int fairwindow; unsigned int enabledcount; + unsigned int bound; }; struct PendingFutureValue { - uint64_t value; - modelclock_t expiration; + ModelAction *writer; ModelAction * act; }; @@ -50,12 +49,25 @@ struct PendingFutureValue { */ struct model_snapshot_members { ModelAction *current_action; - int next_thread_id; + unsigned int next_thread_id; modelclock_t used_sequence_numbers; Thread *nextThread; ModelAction *next_backtrack; }; +/** @brief Records information regarding a single pending release sequence */ +struct release_seq { + /** @brief The acquire operation */ + ModelAction *acquire; + /** @brief The head of the RMW chain from which 'acquire' 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 */ + std::vector writes; +}; + /** @brief The central structure for model-checking */ class ModelChecker { public: @@ -73,11 +85,11 @@ public: void add_thread(Thread *t); void remove_thread(Thread *t); - Thread * get_thread(thread_id_t tid); - Thread * get_thread(ModelAction *act); + Thread * get_thread(thread_id_t tid) const; + Thread * get_thread(ModelAction *act) const; thread_id_t get_next_id(); - int get_num_threads(); + unsigned int get_num_threads(); Thread * get_current_thread(); int switch_to_master(ModelAction *act); @@ -87,7 +99,8 @@ public: bool isfeasible(); bool isfeasibleotherthanRMW(); bool isfinalfeasible(); - void check_promises(ClockVector *old_cv, ClockVector * merge_cv); + void mo_check_promises(thread_id_t tid, const ModelAction *write); + void check_promises(thread_id_t tid, ClockVector *old_cv, ClockVector * merge_cv); void get_release_seq_heads(ModelAction *act, rel_heads_list_t *release_heads); void finish_execution(); bool isfeasibleprefix(); @@ -98,19 +111,24 @@ public: void set_bad_synchronization() { bad_synchronization = true; } const model_params params; + Scheduler * get_scheduler() { return scheduler;} + Node * get_curr_node(); MEMALLOC private: /** The scheduler to use: tracks the running/ready Threads */ Scheduler *scheduler; + 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); bool has_asserted() {return asserted;} void reset_asserted() {asserted=false;} int num_executions; int num_feasible_executions; bool promises_expired(); - + void execute_sleep_set(); + void wake_up_sleeping_actions(ModelAction * curr); modelclock_t get_next_seq_num(); /** @@ -126,6 +144,7 @@ private: bool process_write(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 check_action_enabled(ModelAction *curr); bool take_step(); @@ -138,6 +157,7 @@ private: void reset_to_initial_state(); bool resolve_promises(ModelAction *curr); void compute_promises(ModelAction *curr); + void compute_relseq_breakwrites(ModelAction *curr); void check_curr_backtracking(ModelAction * curr); void add_action_to_lists(ModelAction *act); @@ -149,9 +169,8 @@ private: 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); - bool release_seq_head(const ModelAction *rf, rel_heads_list_t *release_heads) const; + 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 do_complete_join(ModelAction *join); ModelAction *diverge; ModelAction *earliest_diverge; @@ -168,25 +187,33 @@ private: * to a trace of all actions performed on the object. */ HashTable *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, uintptr_t, 4 > *obj_thrd_map; - std::vector *promises; - std::vector *futurevalues; + std::vector< Promise *, SnapshotAlloc > *promises; + std::vector< struct PendingFutureValue, SnapshotAlloc > *futurevalues; /** - * List of acquire actions that might synchronize with one or more - * release sequence. Release sequences might be determined lazily as - * promises are fulfilled and modification orders are established. Each - * ModelAction in this list must be an acquire operation. + * 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. */ - std::vector *pending_acq_rel_seq; + std::vector< struct release_seq *, SnapshotAlloc > *pending_rel_seqs; - std::vector *thrd_last_action; + std::vector< ModelAction *, SnapshotAlloc > *thrd_last_action; NodeStack *node_stack; /** Private data members that should be snapshotted. They are grouped * together for efficiency and maintainability. */ struct model_snapshot_members *priv; + /** A special model-checker Thread; used for associating with + * model-checker-related ModelAcitons */ + Thread *model_thread; + /** * @brief The modification order graph *