model: fully utilize Promise nodes in CycleGraph

[model-checker.git] / promise.cc

diff --git a/promise.cc b/promise.cc
index 7b110020cd869514c0f958055fea357f9f3c42ba..ea5e7e635cf47df48a2ffc15fa0cd35d73b76025 100644 (file)
--- a/promise.cc
+++ b/promise.cc
@@ -1,3 +1,6 @@
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
+
 #include "promise.h"
 #include "model.h"
 #include "schedule.h"
@@ -13,15 +16,56 @@
 bool Promise::eliminate_thread(thread_id_t tid)
 {
        unsigned int id = id_to_int(tid);
-       if (id >= synced_thread.size())
-               synced_thread.resize(id + 1, false);
-       if (synced_thread[id])
+       if (!thread_is_available(tid))
                return false;
 
-       synced_thread[id] = true;
+       available_thread[id] = false;
+       num_available_threads--;
        return has_failed();
 }
 
+/**
+ * Add a thread which may resolve this promise
+ *
+ * @param tid The thread ID
+ */
+void Promise::add_thread(thread_id_t tid)
+{
+       unsigned int id = id_to_int(tid);
+       if (id >= available_thread.size())
+               available_thread.resize(id + 1, false);
+       if (!available_thread[id]) {
+               available_thread[id] = true;
+               num_available_threads++;
+       }
+}
+
+/**
+ * Check if a thread is available for resolving this promise. That is, the
+ * thread must have been previously marked for resolving this promise, and it
+ * cannot have been eliminated due to synchronization, etc.
+ *
+ * @param tid Thread ID of the thread to check
+ * @return True if the thread is available; false otherwise
+ */
+bool Promise::thread_is_available(thread_id_t tid) const
+{
+       unsigned int id = id_to_int(tid);
+       if (id >= available_thread.size())
+               return false;
+       return available_thread[id];
+}
+
+/** @brief Print debug info about the Promise */
+void Promise::print() const
+{
+       model_print("Promised value %#" PRIx64 ", read from thread %d, available threads to resolve: ", value, read->get_tid());
+       for (unsigned int i = 0; i < available_thread.size(); i++)
+               if (available_thread[i])
+                       model_print("[%d]", i);
+       model_print("\n");
+}
+
 /**
  * Check if this promise has failed. A promise can fail when all threads which
  * could possibly satisfy the promise have been eliminated.
@@ -30,12 +74,25 @@ bool Promise::eliminate_thread(thread_id_t tid)
  */
 bool Promise::has_failed() const
 {
-       unsigned int sync_size = synced_thread.size();
-       int promise_tid = id_to_int(read->get_tid());
-       for (unsigned int i = 1; i < model->get_num_threads(); i++) {
-               if ((i >= sync_size || !synced_thread[i]) && ((int)i != promise_tid) && model->is_enabled(int_to_id(i))) {
-                       return false;
-               }
-       }
-       return true;
+       return num_available_threads == 0;
+}
+
+/**
+ * @param write A store which could satisfy this Promise
+ * @return True if the store can satisfy this Promise; false otherwise
+ */
+bool Promise::is_compatible(const ModelAction *write) const
+{
+       return thread_is_available(write->get_tid()) && read->same_var(write);
+}
+
+/**
+ * @brief Check if a promise is compatible with a store and is exclusive to its
+ * thread
+ * @param write The store to check against
+ * @return True if we are compatible and exclusive; false otherwise
+ */
+bool Promise::is_compatible_exclusive(const ModelAction *write) const
+{
+       return get_num_available_threads() == 1 && is_compatible(write);
 }