fix bug in promise handling code...

[model-checker.git] / promise.cc

diff --git a/promise.cc b/promise.cc
index 5197ed3a1e0376d1ea4f6060bcfa042f7cd4f0e9..62e2c9d24d67dbd2509faba6736bec62ea410f84 100644 (file)
--- a/promise.cc
+++ b/promise.cc
@@ -2,20 +2,32 @@
 #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);
-       }
+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])
                return false;
-       
-       synced_thread[id]=true;
-       enabled_type_t * enabled=model->get_scheduler()->get_enabled();
 
-       for(unsigned int i=0;i<model->get_num_threads();i++) {
-               if (!synced_thread[id] && (enabled[id] == THREAD_ENABLED))
+       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;
+}
+
+bool Promise::check_promise() 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))) {
                        return false;
+               }
        }
        return true;
 }