various fixes. linux rw locks should work again with -m 1

[model-checker.git] / promise.h

diff --git a/promise.h b/promise.h
index a47982d6d291078f547acfa2d3ddf9dc33881cc5..ea40df0112b183b515258877af1ce20cb606b30d 100644 (file)
--- a/promise.h
+++ b/promise.h
@@ -6,18 +6,43 @@
 
 #ifndef __PROMISE_H__
 #define __PROMISE_H__
-#include <inttypes.h>
 
+#include <inttypes.h>
+#include "threads-model.h"
 
-class ModelAction;
+#include "model.h"
 
 class Promise {
  public:
-       Promise(ModelAction * act, uint64_t value);
+ Promise(ModelAction *act, uint64_t value, modelclock_t expiration) :
+       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; }
+       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();
+       uint64_t get_value() const { return value; }
+       void set_write(const ModelAction *act) { write = act; }
+       const ModelAction * get_write() { return write; }
+
+       SNAPSHOTALLOC
  private:
-       uint64_t value;
-       ModelAction *read;
-       unsigned int numthreads;
+       std::vector<bool> synced_thread;
+       const uint64_t value;
+       const modelclock_t expiration;
+       ModelAction * const read;
+       const ModelAction * write;
 };
 
 #endif