X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=fd6e6c234f1c4d55e9a9a17ac652484f28be53b2;hb=0170878f8a8be6aa06af6591e50fffdb2ce54022;hp=bc827fa378e6bc260d30f49def8c67420e589d58;hpb=2eb6b99ea42e152d878a8c4805f3cf119f316c3e;p=c11tester.git diff --git a/model.h b/model.h index bc827fa3..fd6e6c23 100644 --- a/model.h +++ b/model.h @@ -17,17 +17,43 @@ #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; + + /** @see ModelChecker::lazy_sync_size */ + unsigned int lazy_sync_size; }; /** @brief The central structure for model-checking */ @@ -45,6 +71,7 @@ public: 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(); @@ -55,24 +82,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, - std::vector *release_heads); - + 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,35 +112,37 @@ 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); bool take_step(); + void check_recency(ModelAction *curr); ModelAction * get_last_conflict(ModelAction *act); void set_backtracking(ModelAction *act); - Thread * get_next_replay_thread(); + Thread * get_next_thread(ModelAction *curr); ModelAction * get_next_backtrack(); void reset_to_initial_state(); 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_seq_cst(ModelAction *curr); 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); - bool release_seq_head(const ModelAction *rf, - std::vector *release_heads) const; - bool resolve_release_sequences(void *location); + 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 *nextThread; ucontext_t system_context; action_list_t *action_trace; @@ -121,6 +154,7 @@ private: HashTable, uintptr_t, 4 > *obj_thrd_map; std::vector *promises; + std::vector *futurevalues; /** * Collection of lists of objects that might synchronize with one or @@ -129,16 +163,27 @@ private: * This structure maps its lists by object location. Each ModelAction * in the lists should be an acquire operation. */ - HashTable, uintptr_t, 4> *lazy_sync_with_release; + HashTable *lazy_sync_with_release; + + /** + * Represents the total size of the + * ModelChecker::lazy_sync_with_release lists. This count should be + * snapshotted, so it is actually a pointer to a location within + * ModelChecker::priv + */ + unsigned int *lazy_sync_size; 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 direceted acyclic graph recording observations of the modification + * 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 @@ -150,8 +195,9 @@ private: * b. */ CycleGraph *mo_graph; - bool failed_promise; + bool too_many_reads; + bool asserted; }; extern ModelChecker *model;