X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=4fc32c6db6c2800d2bdf705d7a8b256683968bab;hb=c451049894af068c8ba22011e3094e66a45d20c3;hp=e8a3efcdfe8266661916f36e989b410cbf1c7405;hpb=6761199295a062ec89e8f3de2f79503e7105e715;p=model-checker.git diff --git a/model.h b/model.h index e8a3efc..4fc32c6 100644 --- a/model.h +++ b/model.h @@ -17,6 +17,7 @@ #include "action.h" #include "clockvector.h" #include "hashtable.h" +#include "workqueue.h" /* Forward declaration */ class NodeStack; @@ -28,6 +29,28 @@ class Promise; * 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 */ @@ -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,29 @@ 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< const ModelAction *, MyAlloc > *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 +110,36 @@ 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); + bool process_read(ModelAction *curr, bool second_part_of_rmw); + bool process_write(ModelAction *curr); bool take_step(); + void check_recency(ModelAction *curr, bool already_added); 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); 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); + bool r_modification_order(ModelAction *curr, const ModelAction *rf); + bool w_modification_order(ModelAction *curr); + bool release_seq_head(const ModelAction *rf, + std::vector< const ModelAction *, MyAlloc > *release_heads) const; + bool resolve_release_sequences(void *location, work_queue_t *work_queue); - ModelAction *current_action; ModelAction *diverge; - thread_id_t nextThread; ucontext_t system_context; action_list_t *action_trace; @@ -118,14 +151,36 @@ 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 + * more release sequence. Release sequences might be determined lazily + * as promises are fulfilled and modification orders are established. + * 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; + + /** + * 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 @@ -137,8 +192,9 @@ private: * b. */ CycleGraph *mo_graph; - bool failed_promise; + bool too_many_reads; + bool asserted; }; extern ModelChecker *model;