local commit... bug that prunes too many executions

[model-checker.git] / promise.h

diff --git a/promise.h b/promise.h
index 11719fc3b2c291307f61e9480205265436ca7b48..2ce3e297305125baa0a057da571cf266965b916e 100644 (file)
--- a/promise.h
+++ b/promise.h
@@ -8,25 +8,40 @@
 #define __PROMISE_H__
 
 #include <inttypes.h>
+#include "threads.h"
 
-class ModelAction;
+#include "model.h"
 
 class Promise {
  public:
  Promise(ModelAction *act, uint64_t value, modelclock_t expiration) :
-       value(value), expiration(expiration), read(act), numthreads(1)
-       { }
+       value(value), expiration(expiration), read(act), write(NULL)
+       { 
+               increment_threads(act->get_tid());
+       }
        modelclock_t get_expiration() const {return expiration;}
        ModelAction * get_action() const { return read; }
-       int increment_threads() { return ++numthreads; }
+       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];
+       }
+
        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;
        const uint64_t value;
        const modelclock_t expiration;
        ModelAction * const read;
-       unsigned int numthreads;
+       const ModelAction * write;
 };
 
 #endif