more changes towards locks

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index 248e1648b7e431c30fe60927274d8ae29a5b3a7f..54f302684fc092b7226fa5a1d0988b536962d236 100644 (file)
--- 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;
@@ -99,6 +100,7 @@ private:
        bool has_asserted() {return asserted;}
        void reset_asserted() {asserted=false;}
        int num_executions;
+       int num_feasible_executions;
        bool promises_expired();
        const model_params params;
 
@@ -135,7 +137,7 @@ private:
        bool w_modification_order(ModelAction *curr);
        bool release_seq_head(const ModelAction *rf,
                        std::vector< const ModelAction *, MyAlloc<const ModelAction *> > *release_heads) const;
-       bool resolve_release_sequences(void *location);
+       bool resolve_release_sequences(void *location, work_queue_t *work_queue);
 
        ModelAction *diverge;
 
@@ -175,6 +177,8 @@ private:
         * together for efficiency and maintainability. */
        struct model_snapshot_members *priv;
 
+       bool * is_enabled;
+
        /**
         * @brief The modification order graph
         *