promise: refactor eliminate_thread()/check_promise()

eliminate_thread() and check_promise() have near-duplicate code, for
checking if the promise has failed. This change makes them consistent
(check_promise() now knows to eliminate its own thread immediately) and
allows one function to simply call the other.

diff --git a/promise.cc b/promise.cc
index 943a0f4f9ba09f1d7a7c67521b1c570ca6db0bf2..c3aee517338d7225621cfbc581281552b99b92aa 100644 (file)
--- a/promise.cc
+++ b/promise.cc
@@ -19,21 +19,15 @@ bool Promise::eliminate_thread(thread_id_t tid)
                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;
+       return check_promise();
 }
 
 bool Promise::check_promise() 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]) && model->is_enabled(int_to_id(i))) {
+               if ((i >= sync_size || !synced_thread[i]) && ((int)i != promise_tid) && model->is_enabled(int_to_id(i))) {
                        return false;
                }
        }