X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=model.h;h=47f5139ba1b82ebe63c804b32945bffd31325bd0;hp=10f84c59ba6710ce1ad3a224d4d9f1784929254c;hb=f71cd7c31df98cfc814254da887de9a30c53b31e;hpb=9616c78511982c9e7205273460ad96210577ebb6 diff --git a/model.h b/model.h index 10f84c59..47f5139b 100644 --- a/model.h +++ b/model.h @@ -17,17 +17,40 @@ #include "action.h" #include "clockvector.h" #include "hashtable.h" +#include "workqueue.h" /* Forward declaration */ class NodeStack; class CycleGraph; class Promise; +/** @brief Shorthand for a list of release sequence heads */ +typedef std::vector< const ModelAction *, MyAlloc > rel_heads_list_t; + /** * Model checker parameter structure. Holds run-time configuration options for * the model checker. */ struct model_params { + int maxreads; + int maxfuturedelay; +}; + +struct PendingFutureValue { + uint64_t value; + modelclock_t expiration; + ModelAction * act; +}; + +/** + * Structure for holding small ModelChecker members that should be snapshotted + */ +struct model_snapshot_members { + ModelAction *current_action; + int next_thread_id; + modelclock_t used_sequence_numbers; + Thread *nextThread; + ModelAction *next_backtrack; }; /** @brief The central structure for model-checking */ @@ -42,11 +65,10 @@ public: /** Prints an execution summary with trace information. */ void print_summary(); - Thread * schedule_next_thread(); - void add_thread(Thread *t); void remove_thread(Thread *t); Thread * get_thread(thread_id_t tid) { return thread_map->get(id_to_int(tid)); } + Thread * get_thread(ModelAction *act) { return get_thread(act->get_tid()); } thread_id_t get_next_id(); int get_num_threads(); @@ -57,22 +79,28 @@ public: 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(); void check_promises(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;} MEMALLOC private: /** The scheduler to use: tracks the running/ready Threads */ Scheduler *scheduler; - int next_thread_id; - modelclock_t used_sequence_numbers; + 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(); const model_params params; /** @@ -81,32 +109,40 @@ private: * data between them. * @param act The ModelAction created by the user-thread action */ - void set_current_action(ModelAction *act) { current_action = act; } - void check_current_action(); + void set_current_action(ModelAction *act) { priv->current_action = act; } + Thread * check_current_action(ModelAction *curr); + ModelAction * initialize_curr_action(ModelAction *curr); + bool process_read(ModelAction *curr, bool second_part_of_rmw); + bool process_write(ModelAction *curr); + void process_mutex(ModelAction *curr); + bool check_action_enabled(ModelAction *curr); bool take_step(); + void check_recency(ModelAction *curr); ModelAction * get_last_conflict(ModelAction *act); void set_backtracking(ModelAction *act); - thread_id_t get_next_replay_thread(); + Thread * get_next_thread(ModelAction *curr); ModelAction * get_next_backtrack(); void reset_to_initial_state(); - void resolve_promises(ModelAction *curr); + bool resolve_promises(ModelAction *curr); void compute_promises(ModelAction *curr); + void check_curr_backtracking(ModelAction * curr); void add_action_to_lists(ModelAction *act); - ModelAction * get_last_action(thread_id_t tid); - ModelAction * get_parent_action(thread_id_t tid); - ModelAction * get_last_seq_cst(const void *location); + ModelAction * get_last_action(thread_id_t tid) const; + ModelAction * get_last_seq_cst(ModelAction *curr) 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); - void r_modification_order(ModelAction * curr, const ModelAction *rf); - void w_modification_order(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); + bool release_seq_head(const ModelAction *rf, rel_heads_list_t *release_heads) const; + bool resolve_release_sequences(void *location, work_queue_t *work_queue); + void do_complete_join(ModelAction *join); - ModelAction *current_action; ModelAction *diverge; - thread_id_t nextThread; ucontext_t system_context; action_list_t *action_trace; @@ -116,13 +152,47 @@ private: * to a trace of all actions performed on the object. */ 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, uintptr_t, 4 > *obj_thrd_map; - std::vector * promises; + std::vector *promises; + std::vector *futurevalues; + + /** + * List of acquire actions that might synchronize with one or more + * release sequence. Release sequences might be determined lazily as + * promises are fulfilled and modification orders are established. Each + * ModelAction in this list must be an acquire operation. + */ + std::vector *pending_acq_rel_seq; + std::vector *thrd_last_action; NodeStack *node_stack; - ModelAction *next_backtrack; + + /** Private data members that should be snapshotted. They are grouped + * together for efficiency and maintainability. */ + struct model_snapshot_members *priv; + + /** + * @brief The modification order graph + * + * A directed acyclic graph recording observations of the modification + * order on all the atomic objects in the system. This graph should + * never contain any cycles, as that represents a violation of the + * memory model (total ordering). This graph really consists of many + * disjoint (unconnected) subgraphs, each graph corresponding to a + * separate ordering on a distinct object. + * + * The edges in this graph represent the "ordered before" relation, + * such that a --> b means a was ordered before + * b. + */ CycleGraph *mo_graph; bool failed_promise; + bool too_many_reads; + bool asserted; }; extern ModelChecker *model;