Merge branch 'norris'

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index 47f5139ba1b82ebe63c804b32945bffd31325bd0..fa11cb8cbbf5f0e5ed3f3ffa727b6ac9aea8ce66 100644 (file)
--- a/model.h
+++ b/model.h
@@ -34,6 +34,8 @@ typedef std::vector< const ModelAction *, MyAlloc<const ModelAction *> > rel_hea
 struct model_params {
        int maxreads;
        int maxfuturedelay;
+       unsigned int fairwindow;
+       unsigned int enabledcount;
 };
 
 struct PendingFutureValue {
@@ -89,6 +91,7 @@ public:
        void finish_execution();
        bool isfeasibleprefix();
        void set_assert() {asserted=true;}
+       const model_params params;
 
        MEMALLOC
 private:
@@ -101,7 +104,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