X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=model.h;h=7bc3585d8562eeff369cf307b81751781e381f6b;hp=13704241a83285dba37651a5e7b8ea699a1d2281;hb=b8b39c87557325a384faa45d0cae56a6f71f52b1;hpb=2f6c80b075c5da5c6d412955fe8e322d479955dd diff --git a/model.h b/model.h index 1370424..7bc3585 100644 --- a/model.h +++ b/model.h @@ -10,22 +10,22 @@ #include #include -#include "schedule.h" #include "mymemory.h" -#include "libthreads.h" -#include "threads.h" #include "action.h" -#include "clockvector.h" #include "hashtable.h" #include "workqueue.h" +#include "config.h" +#include "modeltypes.h" /* Forward declaration */ class NodeStack; class CycleGraph; class Promise; +class Scheduler; +class Thread; /** @brief Shorthand for a list of release sequence heads */ -typedef std::vector< const ModelAction *, MyAlloc > rel_heads_list_t; +typedef std::vector< const ModelAction *, ModelAlloc > rel_heads_list_t; /** * Model checker parameter structure. Holds run-time configuration options for @@ -34,6 +34,8 @@ typedef std::vector< const ModelAction *, MyAlloc > rel_hea struct model_params { int maxreads; int maxfuturedelay; + unsigned int fairwindow; + unsigned int enabledcount; }; struct PendingFutureValue { @@ -47,13 +49,23 @@ struct PendingFutureValue { */ struct model_snapshot_members { ModelAction *current_action; - int next_thread_id; + unsigned 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 Records information regarding a single pending release sequence */ +struct release_seq { + /** @brief The acquire operation */ + ModelAction *acquire; + /** @brief The head of the RMW chain from which 'acquire' reads; may be + * equal to 'release' */ + const ModelAction *rf; + /** @brief The head of the potential longest release sequence chain */ + const ModelAction *release; + /** @brief The write(s) that may break the release sequence */ + std::vector writes; }; /** @brief The central structure for model-checking */ @@ -67,18 +79,18 @@ public: /** Prints an execution summary with trace information. */ void print_summary(); +#if SUPPORT_MOD_ORDER_DUMP + void dumpGraph(char *filename); +#endif 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 * get_thread(thread_id_t tid) const; + Thread * get_thread(ModelAction *act) const; thread_id_t get_next_id(); - int get_num_threads(); - modelclock_t get_next_seq_num(); - - /** @return The currently executing Thread. */ - Thread * get_current_thread() { return scheduler->get_current_thread(); } + unsigned int get_num_threads(); + Thread * get_current_thread(); int switch_to_master(ModelAction *act); ClockVector * get_cv(thread_id_t tid); @@ -87,12 +99,20 @@ public: bool isfeasible(); bool isfeasibleotherthanRMW(); bool isfinalfeasible(); - void check_promises(ClockVector *old_cv, ClockVector * merge_cv); + 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;} + /** @brief Alert the model-checker that an incorrectly-ordered + * synchronization was made */ + void set_bad_synchronization() { bad_synchronization = true; } + + const model_params params; + Scheduler * get_scheduler() { return scheduler;} + MEMALLOC private: /** The scheduler to use: tracks the running/ready Threads */ @@ -104,7 +124,9 @@ private: int num_executions; int num_feasible_executions; bool promises_expired(); - const model_params params; + 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 @@ -117,12 +139,14 @@ private: 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 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(); - void check_recency(ModelAction *curr); + void check_recency(ModelAction *curr, const ModelAction *rf); ModelAction * get_last_conflict(ModelAction *act); void set_backtracking(ModelAction *act); Thread * get_next_thread(ModelAction *curr); @@ -130,6 +154,7 @@ 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); @@ -141,11 +166,12 @@ private: 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 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; ucontext_t system_context; action_list_t *action_trace; @@ -164,21 +190,12 @@ private: 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 *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 + * List of pending release sequences. Release sequences might be + * determined lazily as promises are fulfilled and modification orders + * are established. Each entry in the list may only be partially + * filled, depending on its pending status. */ - unsigned int *lazy_sync_size; + std::vector *pending_rel_seqs; std::vector *thrd_last_action; NodeStack *node_stack; @@ -187,6 +204,10 @@ private: * 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 * @@ -205,6 +226,8 @@ private: bool failed_promise; bool too_many_reads; bool asserted; + /** @brief Incorrectly-ordered synchronization was made */ + bool bad_synchronization; }; extern ModelChecker *model;