X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=model.h;h=d0e47d9d6212ad004194aac45ef070a96ed5d2c0;hp=d2baaf45afee14661a02c620649e4efdfcf107ee;hb=004ffe355e33b1b5e88095a0873fa5119993c7bc;hpb=59eb730e1d19a0825008c40eb521bfc5c29df5f9 diff --git a/model.h b/model.h index d2baaf45..d0e47d9d 100644 --- a/model.h +++ b/model.h @@ -5,7 +5,6 @@ #ifndef __MODEL_H__ #define __MODEL_H__ -#include #include #include #include @@ -23,6 +22,7 @@ class CycleGraph; class Promise; class Scheduler; class Thread; +struct model_snapshot_members; /** @brief Shorthand for a list of release sequence heads */ typedef std::vector< const ModelAction *, ModelAlloc > rel_heads_list_t; @@ -36,23 +36,39 @@ struct model_params { int maxfuturedelay; unsigned int fairwindow; unsigned int enabledcount; + unsigned int bound; + + /** @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; }; -struct PendingFutureValue { - uint64_t value; - modelclock_t expiration; - ModelAction * act; +/** @brief Model checker execution stats */ +struct execution_stats { + int num_total; /**< @brief Total number of executions */ + 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 */ }; -/** - * Structure for holding small ModelChecker members that should be snapshotted - */ -struct model_snapshot_members { - ModelAction *current_action; - unsigned int next_thread_id; - modelclock_t used_sequence_numbers; - Thread *nextThread; - ModelAction *next_backtrack; +struct PendingFutureValue { + ModelAction *writer; + ModelAction *act; }; /** @brief Records information regarding a single pending release sequence */ @@ -74,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 @@ -88,59 +105,54 @@ public: Thread * get_thread(thread_id_t tid) const; Thread * get_thread(ModelAction *act) const; + bool is_enabled(Thread *t) const; + bool is_enabled(thread_id_t tid) const; + thread_id_t get_next_id(); - unsigned int get_num_threads(); - Thread * get_current_thread(); + unsigned int get_num_threads() const; + 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(); - bool isfeasibleotherthanRMW(); - bool isfinalfeasible(); + 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(); - void set_assert() {asserted=true;} + bool isfeasibleprefix() const; + + bool assert_bug(const char *msg); + void assert_user_bug(const char *msg); - /** @brief Alert the model-checker that an incorrectly-ordered - * synchronization was made */ - void set_bad_synchronization() { bad_synchronization = true; } + void set_bad_synchronization(); const model_params params; - Scheduler * get_scheduler() { return scheduler;} + Node * get_curr_node() const; 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 has_asserted() {return asserted;} - void reset_asserted() {asserted=false;} - int num_executions; - int num_feasible_executions; - bool promises_expired(); + bool mo_may_allow(const ModelAction * writer, const ModelAction *reader); + bool has_asserted() const; + void set_assert(); + bool promises_expired() const; void execute_sleep_set(); void wake_up_sleeping_actions(ModelAction * curr); modelclock_t get_next_seq_num(); - /** - * Stores the ModelAction for the current thread action. Call this - * immediately before switching from user- to system-context to pass - * data between them. - * @param act The ModelAction created by the user-thread action - */ - void set_current_action(ModelAction *act) { priv->current_action = act; } + bool next_execution(); + void set_current_action(ModelAction *act); Thread * check_current_action(ModelAction *curr); - ModelAction * initialize_curr_action(ModelAction *curr); + bool initialize_curr_action(ModelAction **curr); bool process_read(ModelAction *curr, bool second_part_of_rmw); 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(); @@ -153,11 +165,12 @@ 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); ModelAction * get_last_action(thread_id_t tid) const; - ModelAction * get_last_seq_cst(ModelAction *curr) const; + ModelAction * get_last_seq_cst_write(ModelAction *curr) const; ModelAction * get_last_unlock(ModelAction *curr) const; void build_reads_from_past(ModelAction *curr); ModelAction * process_rmw(ModelAction *curr); @@ -166,7 +179,6 @@ private: bool w_modification_order(ModelAction *curr); 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; @@ -177,15 +189,19 @@ private: /** Per-object list of actions. Maps an object (i.e., memory location) * to a trace of all actions performed on the object. */ - HashTable *obj_map; + HashTable *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 *lock_waiters_map; + HashTable *lock_waiters_map; - HashTable, uintptr_t, 4 > *obj_thrd_map; - std::vector *promises; - std::vector *futurevalues; + /** 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< Promise *, SnapshotAlloc > *promises; + std::vector< struct PendingFutureValue, SnapshotAlloc > *futurevalues; /** * List of pending release sequences. Release sequences might be @@ -193,15 +209,19 @@ private: * are established. Each entry in the list may only be partially * filled, depending on its pending status. */ - std::vector *pending_rel_seqs; + 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 * @@ -217,11 +237,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;