model: add const to get_thread(ModelAction *act)

[cdsspec-compiler.git] / promise.cc

diff --git a/promise.cc b/promise.cc
index 943a0f4f9ba09f1d7a7c67521b1c570ca6db0bf2..016b809aefaacf0d6e38e0674e60b89503bb3d31 100644 (file)
--- a/promise.cc
+++ b/promise.cc
@@ -13,29 +13,41 @@
 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 (id >= eliminated_thread.size())
+               eliminated_thread.resize(id + 1, false);
+       if (eliminated_thread[id])
                return false;
 
-       synced_thread[id] = true;
-       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;
+       eliminated_thread[id] = true;
+       return has_failed();
+}
+
+/**
+ * Check if a thread has already been eliminated from resolving this
+ * promise
+ * @param tid Thread ID of the thread to check
+ * @return True if the thread is already eliminated; false otherwise
+ */
+bool Promise::thread_is_eliminated(thread_id_t tid) const
+{
+       unsigned int id = id_to_int(tid);
+       if (id >= eliminated_thread.size())
+               return false;
+       return eliminated_thread[id];
 }
 
-bool Promise::check_promise() const
+/**
+ * Check if this promise has failed. A promise can fail when all threads which
+ * could possibly satisfy the promise have been eliminated.
+ *
+ * @return True, if this promise has failed; false otherwise
+ */
+bool Promise::has_failed() const
 {
-       unsigned int sync_size = synced_thread.size();
        for (unsigned int i = 1; i < model->get_num_threads(); i++) {
-               if ((i >= sync_size || !synced_thread[i]) && model->is_enabled(int_to_id(i))) {
+               thread_id_t tid = int_to_id(i);
+               if (!thread_is_eliminated(tid) && model->is_enabled(tid))
                        return false;
-               }
        }
        return true;
 }