promise: move thread_is_eliminated()

[model-checker.git] / promise.h

diff --git a/promise.h b/promise.h
index 413d360896e282abb66a21d98c3cec689c428dd9..1f8a810ad33e0ab0a3de283eb19bd8f711ea745e 100644 (file)
--- a/promise.h
+++ b/promise.h
@@ -20,30 +20,26 @@ struct future_value {
 
 class Promise {
  public:
- Promise(ModelAction *act, uint64_t value, modelclock_t expiration) :
-       value(value), expiration(expiration), read(act), write(NULL)
+       Promise(ModelAction *act, struct future_value fv) :
+               value(fv.value),
+               expiration(fv.expiration),
+               read(act),
+               write(NULL)
        {
-               increment_threads(act->get_tid());
+               eliminate_thread(act->get_tid());
        }
        modelclock_t get_expiration() const { return expiration; }
        ModelAction * get_action() const { return read; }
-       bool increment_threads(thread_id_t tid);
-
-       bool has_sync_thread(thread_id_t tid) {
-               unsigned int id = id_to_int(tid);
-               if (id >= synced_thread.size())
-                       return false;
-               return synced_thread[id];
-       }
-
-       bool check_promise() const;
+       bool eliminate_thread(thread_id_t tid);
+       bool thread_is_eliminated(thread_id_t tid) const;
+       bool has_failed() const;
        uint64_t get_value() const { return value; }
        void set_write(const ModelAction *act) { write = act; }
        const ModelAction * get_write() { return write; }
 
        SNAPSHOTALLOC
  private:
-       std::vector<bool> synced_thread;
+       std::vector<bool> eliminated_thread;
        const uint64_t value;
        const modelclock_t expiration;
        ModelAction * const read;