model: flatten "pending acquire/release sequence" structure

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index eb50d371e2e1694c2d4494467a1bf7325524b925..47f5139ba1b82ebe63c804b32945bffd31325bd0 100644 (file)
--- a/model.h
+++ b/model.h
@@ -51,9 +51,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 */
@@ -117,6 +114,8 @@ 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 check_action_enabled(ModelAction *curr);
 
        bool take_step();
 
@@ -131,8 +130,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);
@@ -152,26 +152,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;