X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;ds=sidebyside;f=promise.h;h=9ddaea8d6dbfb296f187df94f47141a6cf0376f4;hb=2d685f1dc9ae1f1ace850737196e6e40d2f9e326;hp=2ce3e297305125baa0a057da571cf266965b916e;hpb=c832cb55af09e735821ae3463bc37c29d3fa27c8;p=model-checker.git diff --git a/promise.h b/promise.h index 2ce3e29..9ddaea8 100644 --- a/promise.h +++ b/promise.h @@ -8,7 +8,7 @@ #define __PROMISE_H__ #include -#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(); uint64_t get_value() const { return value; } void set_write(const ModelAction *act) { write = act; } const ModelAction * get_write() { return write; }