X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=62c762711bcb8300765483ee075ec9747d412d5f;hb=bbc3405aa23e6eafb3863738c4e203764694e9a4;hp=fd6e6c234f1c4d55e9a9a17ac652484f28be53b2;hpb=bd893aac350f125dc990f0ccd32b8e3cf133e2fb;p=model-checker.git diff --git a/model.h b/model.h index fd6e6c2..62c7627 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 { @@ -51,9 +53,6 @@ struct model_snapshot_members { 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 */ @@ -67,18 +66,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); + Thread * get_thread(ModelAction *act); 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(); } + Thread * get_current_thread(); int switch_to_master(ModelAction *act); ClockVector * get_cv(thread_id_t tid); @@ -93,6 +92,12 @@ public: 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; + MEMALLOC private: /** The scheduler to use: tracks the running/ready Threads */ @@ -104,7 +109,8 @@ private: int num_executions; int num_feasible_executions; bool promises_expired(); - const model_params params; + + modelclock_t get_next_seq_num(); /** * Stores the ModelAction for the current thread action. Call this @@ -117,10 +123,13 @@ private: ModelAction * 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); + 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); @@ -131,8 +140,9 @@ private: void check_curr_backtracking(ModelAction * curr); void add_action_to_lists(ModelAction *act); - ModelAction * get_last_action(thread_id_t tid); - ModelAction * get_last_seq_cst(ModelAction *curr); + 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); @@ -143,6 +153,7 @@ private: void do_complete_join(ModelAction *join); ModelAction *diverge; + ModelAction *earliest_diverge; ucontext_t system_context; action_list_t *action_trace; @@ -152,26 +163,21 @@ 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 *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 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. */ - unsigned int *lazy_sync_size; + std::vector *pending_acq_rel_seq; std::vector *thrd_last_action; NodeStack *node_stack; @@ -198,6 +204,8 @@ private: bool failed_promise; bool too_many_reads; bool asserted; + /** @brief Incorrectly-ordered synchronization was made */ + bool bad_synchronization; }; extern ModelChecker *model;