fix bug in promise handling code...

[model-checker.git] / promise.h

diff --git a/promise.h b/promise.h
index 2ce3e297305125baa0a057da571cf266965b916e..3166c8f6f1603bfad9ba27124f60fcca73b55d41 100644 (file)
--- a/promise.h
+++ b/promise.h
@@ -8,7 +8,7 @@
 #define __PROMISE_H__
 
 #include <inttypes.h>
-#include "threads.h"
+#include "threads-model.h"
 
 #include "model.h"
 
@@ -16,21 +16,21 @@ class Promise {
  public:
  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;}
+       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()) {
+       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;
        uint64_t get_value() const { return value; }
        void set_write(const ModelAction *act) { write = act; }
        const ModelAction * get_write() { return write; }
@@ -41,7 +41,7 @@ class Promise {
        const uint64_t value;
        const modelclock_t expiration;
        ModelAction * const read;
-       const ModelAction * write;
+       const ModelAction *write;
 };
 
 #endif