X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=model.h;h=12ec06c060a999e256dfb57ea0088c97a09f81c3;hp=fe76d7f9e6b401b6e7c868b8fe6e515b39d79ba0;hb=2b004336a919f74a5ca8f6d87ad5414360a949c7;hpb=6caada76d7318c7853dd334bccbfed0367c242ec diff --git a/model.h b/model.h index fe76d7f9..12ec06c0 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 @@ -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 */ @@ -71,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 */ @@ -90,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 */ @@ -109,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; @@ -141,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(); @@ -167,16 +172,22 @@ 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(); - 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); @@ -196,13 +207,13 @@ private: 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; @@ -215,17 +226,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 @@ -233,10 +240,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