model: add "bad synchronization" flag

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index 54f302684fc092b7226fa5a1d0988b536962d236..4b9e3ff53f0082b30efd095b5618186480882d5e 100644 (file)
--- a/model.h
+++ b/model.h
@@ -24,6 +24,9 @@ class NodeStack;
 class CycleGraph;
 class Promise;
 
+/** @brief Shorthand for a list of release sequence heads */
+typedef std::vector< const ModelAction *, MyAlloc<const ModelAction *> > rel_heads_list_t;
+
 /**
  * Model checker parameter structure. Holds run-time configuration options for
  * the model checker.
@@ -31,6 +34,8 @@ class Promise;
 struct model_params {
        int maxreads;
        int maxfuturedelay;
+       unsigned int fairwindow;
+       unsigned int enabledcount;
 };
 
 struct PendingFutureValue {
@@ -48,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 */
@@ -85,12 +87,17 @@ public:
        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<const ModelAction *> > *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;}
 
+       /** @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 */
@@ -102,7 +109,6 @@ private:
        int num_executions;
        int num_feasible_executions;
        bool promises_expired();
-       const model_params params;
 
        /**
         * Stores the ModelAction for the current thread action.  Call this
@@ -112,12 +118,16 @@ private:
         */
        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 process_mutex(ModelAction *curr);
+       bool process_thread_action(ModelAction *curr);
+       bool check_action_enabled(ModelAction *curr);
 
        bool take_step();
 
-       void check_recency(ModelAction *curr, bool already_added);
+       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);
@@ -128,16 +138,17 @@ 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(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);
        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<const ModelAction *> > *release_heads) const;
+       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 *diverge;
 
@@ -149,26 +160,21 @@ private:
         * to a trace of all actions performed on the object. */
        HashTable<const void *, action_list_t, uintptr_t, 4> *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<const void *, action_list_t, uintptr_t, 4> *lock_waiters_map;
+
        HashTable<void *, std::vector<action_list_t>, uintptr_t, 4 > *obj_thrd_map;
        std::vector<Promise *> *promises;
        std::vector<struct PendingFutureValue> *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<void *, std::list<ModelAction *>, 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
+        * 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<ModelAction *> *pending_acq_rel_seq;
 
        std::vector<ModelAction *> *thrd_last_action;
        NodeStack *node_stack;
@@ -177,8 +183,6 @@ private:
         * together for efficiency and maintainability. */
        struct model_snapshot_members *priv;
 
-       bool * is_enabled;
-
        /**
         * @brief The modification order graph
         *
@@ -197,6 +201,8 @@ private:
        bool failed_promise;
        bool too_many_reads;
        bool asserted;
+       /** @brief Incorrectly-ordered synchronization was made */
+       bool bad_synchronization;
 };
 
 extern ModelChecker *model;