scanalysis: install ModelExecution object in the analysis

[model-checker.git] / promise.h

diff --git a/promise.h b/promise.h
index 5ea7dc58d0470a29a537985c6322f8792be1f856..e8c233c61d8240d4820fc39ad7d735d0ffeff355 100644 (file)
--- a/promise.h
+++ b/promise.h
@@ -8,10 +8,10 @@
 #define __PROMISE_H__
 
 #include <inttypes.h>
-#include <vector>
 
 #include "modeltypes.h"
 #include "mymemory.h"
+#include "stl-model.h"
 
 class ModelAction;
 
@@ -36,11 +36,15 @@ class Promise {
        int get_num_available_threads() const { return num_available_threads; }
        bool is_compatible(const ModelAction *act) const;
        bool is_compatible_exclusive(const ModelAction *act) const;
+       bool same_value(const ModelAction *write) const;
+       bool same_location(const ModelAction *act) const;
 
        modelclock_t get_expiration() const { return fv.expiration; }
        uint64_t get_value() const { return fv.value; }
        struct future_value get_fv() const { return fv; }
 
+       int get_index() const;
+
        void print() const;
 
        bool equals(const Promise *x) const { return this == x; }
@@ -50,14 +54,14 @@ class Promise {
  private:
        /** @brief Thread ID(s) for thread(s) that potentially can satisfy this
         *  promise */
-       std::vector< bool, SnapshotAlloc<bool> > available_thread;
+       SnapVector<bool> available_thread;
 
        int num_available_threads;
 
        const future_value fv;
 
        /** @brief The action(s) which read the promised future value */
-       std::vector< ModelAction *, SnapshotAlloc<ModelAction *> > readers;
+       SnapVector<ModelAction *> readers;
 
        const ModelAction *write;
 };