X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=3327683e65efb21c2fe716c6ccc6fbef1cc8dc8f;hb=78ec1662db6d8967b68d10602131d0ea7f3794e1;hp=236bbe99497467165fe03ac05f760d778d307276;hpb=5ea8e3d5d861ed363e5ac5f3b20b8181dd197efb;p=c11tester.git diff --git a/model.h b/model.h index 236bbe99..3327683e 100644 --- a/model.h +++ b/model.h @@ -5,9 +5,7 @@ #ifndef __MODEL_H__ #define __MODEL_H__ -#include #include -#include #include #include "mymemory.h" @@ -16,6 +14,8 @@ #include "config.h" #include "modeltypes.h" #include "stl-model.h" +#include "context.h" +#include "params.h" /* Forward declaration */ class Node; @@ -25,45 +25,13 @@ class Promise; class Scheduler; class Thread; class ClockVector; +class TraceAnalysis; struct model_snapshot_members; /** @brief Shorthand for a list of release sequence heads */ typedef ModelVector rel_heads_list_t; - typedef SnapList action_list_t; -/** - * Model checker parameter structure. Holds run-time configuration options for - * the model checker. - */ -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 */ - int maxfuturevalues; - - /** @brief Only generate a new future value/expiration pair if the - * expiration time exceeds the existing one by more than the slop - * value */ - unsigned int expireslop; - - /** @brief Verbosity (0 = quiet; 1 = noisy) */ - int verbose; - - /** @brief Command-line argument count to pass to user program */ - int argc; - - /** @brief Command-line arguments to pass to user program */ - char **argv; -}; - /** @brief Model checker execution stats */ struct execution_stats { int num_total; /**< @brief Total number of executions */ @@ -74,9 +42,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 */ @@ -112,8 +82,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; @@ -133,20 +101,29 @@ 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; Node * get_curr_node() const; + void add_trace_analysis(TraceAnalysis *a) { + trace_analyses->push_back(a); + } + + action_list_t * get_actions_on_obj(void * obj, thread_id_t tid); + ModelAction * get_last_action(thread_id_t tid) const; MEMALLOC 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(); @@ -166,9 +143,11 @@ private: bool process_thread_action(ModelAction *curr); void process_relseq_fixup(ModelAction *curr, work_queue_t *work_queue); bool read_from(ModelAction *act, const ModelAction *rf); + bool synchronize(const ModelAction *first, ModelAction *second); 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; @@ -184,8 +163,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); @@ -194,7 +173,6 @@ private: void check_curr_backtracking(ModelAction *curr); void add_action_to_lists(ModelAction *act); - ModelAction * get_last_action(thread_id_t tid) const; ModelAction * get_last_fence_release(thread_id_t tid) const; ModelAction * get_last_seq_cst_write(ModelAction *curr) const; ModelAction * get_last_seq_cst_fence(thread_id_t tid, const ModelAction *before_fence) const; @@ -224,10 +202,6 @@ 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; @@ -247,6 +221,8 @@ private: SnapVector * const thrd_last_action; SnapVector * const thrd_last_fence_release; NodeStack * const node_stack; + ModelVector * trace_analyses; + /** Private data members that should be snapshotted. They are grouped * together for efficiency and maintainability. */ @@ -275,12 +251,12 @@ private: /** @brief The cumulative execution stats */ struct execution_stats stats; void record_stats(); - + void run_trace_analyses(); void print_infeasibility(const char *prefix) const; bool is_feasible_prefix_ignore_relseq() const; bool is_infeasible() const; bool is_deadlocked() const; - bool is_circular_wait(const Thread *t) const; + bool too_many_steps() const; bool is_complete_execution() const; bool have_bug_reports() const; void print_bugs() const;