promise: move thread_is_eliminated()

[model-checker.git] / promise.cc

diff --git a/promise.cc b/promise.cc
index 68290eecefac6c7ed72673e01a941e9f0afda3be..7f6f5e7b1823bb5dd3285196ba57f4ee172b0f37 100644 (file)
--- a/promise.cc
+++ b/promise.cc
@@ -2,31 +2,52 @@
 #include "model.h"
 #include "schedule.h"
 
-bool Promise::increment_threads(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])
+/**
+ * Eliminate a thread which no longer can satisfy this promise. Once all
+ * enabled threads have been eliminated, this promise is unresolvable.
+ *
+ * @param tid The thread ID of the thread to eliminate
+ * @return True, if this elimination has invalidated the promise; false
+ * otherwise
+ */
+bool Promise::eliminate_thread(thread_id_t tid)
+{
+       unsigned int id = id_to_int(tid);
+       if (id >= eliminated_thread.size())
+               eliminated_thread.resize(id + 1, false);
+       if (eliminated_thread[id])
                return false;
-       
-       synced_thread[id]=true;
-       enabled_type_t * enabled=model->get_scheduler()->get_enabled();
-       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 ) && (enabled[i] != THREAD_DISABLED)) {
-                       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() {
-       enabled_type_t * enabled=model->get_scheduler()->get_enabled();
-       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]) && (enabled[i] != THREAD_DISABLED)) {
+/**
+ * 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 size = eliminated_thread.size();
+       int promise_tid = id_to_int(read->get_tid());
+       for (unsigned int i = 1; i < model->get_num_threads(); i++) {
+               if ((i >= size || !eliminated_thread[i]) && ((int)i != promise_tid) && model->is_enabled(int_to_id(i))) {
                        return false;
                }
        }