X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=model.h;h=a2bbab2eee0aef821ae9e7ef1e79820a71da958c;hp=86fa3e6ab901364c1b7f1df2214c568529fe238a;hb=67e374f0a24b266f2ea81913770e89a4aac68ff3;hpb=e83585ce14ab6ae325c83d815dce8eb77b0e5897 diff --git a/model.h b/model.h index 86fa3e6a..a2bbab2e 100644 --- a/model.h +++ b/model.h @@ -5,7 +5,6 @@ #ifndef __MODEL_H__ #define __MODEL_H__ -#include #include #include #include @@ -47,6 +46,15 @@ struct model_params { * 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 */ @@ -55,6 +63,7 @@ struct execution_stats { int num_infeasible; /**< @brief Number of infeasible executions */ int num_buggy_executions; /** @brief Number of buggy executions */ int num_complete; /**< @brief Number of feasible, non-buggy, complete executions */ + int num_redundant; /**< @brief Number of redundant, aborted executions */ }; struct PendingFutureValue { @@ -81,11 +90,12 @@ public: ModelChecker(struct model_params params); ~ModelChecker(); + void run(); + /** @returns the context for the main model-checking system thread */ ucontext_t * get_system_context() { return &system_context; } - /** Prints an execution summary with trace information. */ - void print_summary(); + void print_summary() const; #if SUPPORT_MOD_ORDER_DUMP void dumpGraph(char *filename); #endif @@ -100,36 +110,21 @@ public: thread_id_t get_next_id(); unsigned int get_num_threads() const; - Thread * get_current_thread(); + Thread * get_current_thread() const; int switch_to_master(ModelAction *act); - ClockVector * get_cv(thread_id_t tid); - ModelAction * get_parent_action(thread_id_t tid); - bool next_execution(); - bool isfeasible() const; - bool isfeasibleotherthanRMW() const; - bool isfinalfeasible() const; + 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); - void get_release_seq_heads(ModelAction *act, rel_heads_list_t *release_heads); - void finish_execution(); bool isfeasibleprefix() const; bool assert_bug(const char *msg); void assert_user_bug(const char *msg); - void set_assert() {asserted=true;} - bool is_deadlocked() const; - bool is_complete_execution() const; - void print_stats() const; - - /** @brief Alert the model-checker that an incorrectly-ordered - * synchronization was made */ - void set_bad_synchronization() { bad_synchronization = true; } - const model_params params; - Node * get_curr_node(); + Node * get_curr_node() const; MEMALLOC private: @@ -139,13 +134,15 @@ private: 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;} + bool has_asserted() const; + void set_assert(); + void set_bad_synchronization(); bool promises_expired() const; void execute_sleep_set(); 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); bool initialize_curr_action(ModelAction **curr); @@ -154,6 +151,7 @@ private: bool process_mutex(ModelAction *curr); 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 check_action_enabled(ModelAction *curr); bool take_step(); @@ -171,13 +169,16 @@ 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_seq_cst(ModelAction *curr) 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; ModelAction * get_last_unlock(ModelAction *curr) const; void build_reads_from_past(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); + void get_release_seq_heads(ModelAction *act, 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); @@ -213,6 +214,7 @@ private: std::vector< struct release_seq *, SnapshotAlloc > *pending_rel_seqs; std::vector< ModelAction *, SnapshotAlloc > *thrd_last_action; + std::vector< ModelAction *, SnapshotAlloc > *thrd_last_fence_release; NodeStack *node_stack; /** Private data members that should be snapshotted. They are grouped @@ -238,18 +240,22 @@ private: * b. */ CycleGraph *mo_graph; - bool failed_promise; - bool too_many_reads; - bool asserted; - /** @brief Incorrectly-ordered synchronization was made */ - bool bad_synchronization; /** @brief The cumulative execution stats */ struct execution_stats stats; void record_stats(); + 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; bool have_bug_reports() const; void print_bugs() const; + void print_execution(bool printbugs) const; + void print_stats() const; + + friend void user_main_wrapper(); }; extern ModelChecker *model;