X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=model.h;h=8fdfc47ae41a8fc0419d04c1570075bdddb0243e;hp=96c1ec78a60ca343400c309b2e756ae53fb39967;hb=4fa31aac91303266f4c87a6cd5d60cbab34135db;hpb=b2f34d7f1d030f414786ea0b1a5709dcac604c7b diff --git a/model.h b/model.h index 96c1ec7..8fdfc47 100644 --- a/model.h +++ b/model.h @@ -5,9 +5,7 @@ #ifndef __MODEL_H__ #define __MODEL_H__ -#include #include -#include #include #include "mymemory.h" @@ -15,6 +13,8 @@ #include "workqueue.h" #include "config.h" #include "modeltypes.h" +#include "stl-model.h" +#include "context.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 @@ -73,9 +73,11 @@ struct execution_stats { }; struct PendingFutureValue { - PendingFutureValue(ModelAction *writer, ModelAction *act) : writer(writer), act(act) { } + PendingFutureValue(ModelAction *writer, ModelAction *reader) : + writer(writer), reader(reader) + { } const ModelAction *writer; - ModelAction *act; + ModelAction *reader; }; /** @brief Records information regarding a single pending release sequence */ @@ -92,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 */ @@ -111,8 +113,6 @@ 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; @@ -132,7 +132,7 @@ public: void check_promises(thread_id_t tid, ClockVector *old_cv, ClockVector *merge_cv); bool isfeasibleprefix() const; - bool assert_bug(const char *msg); + bool assert_bug(const char *msg, ...); void assert_user_bug(const char *msg); const model_params params; @@ -143,9 +143,12 @@ 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 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(); @@ -168,6 +171,7 @@ private: 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; @@ -183,8 +187,8 @@ private: bool set_latest_backtrack(ModelAction *act); ModelAction * get_next_backtrack(); void reset_to_initial_state(); - int get_promise_to_resolve(const ModelAction *curr) const; - bool resolve_promise(ModelAction *curr, unsigned int promise_idx); + 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); @@ -204,7 +208,7 @@ private: template bool r_modification_order(ModelAction *curr, const rf_type *rf); - bool w_modification_order(ModelAction *curr, std::vector< ModelAction *, ModelAlloc > *send_fv); + 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); @@ -223,17 +227,13 @@ private: * 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 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 * 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 @@ -241,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 @@ -279,7 +279,6 @@ 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;