local commit... bug that prunes too many executions

[c11tester.git] / cyclegraph.cc

diff --git a/cyclegraph.cc b/cyclegraph.cc
index f4d3b93314b4ad22dba40d4d56043fd5643c01d1..2280e76e3e208b8ac6ce6e2044433c1a866d2c85 100644 (file)
--- a/cyclegraph.cc
+++ b/cyclegraph.cc
@@ -1,6 +1,8 @@
 #include "cyclegraph.h"
 #include "action.h"
 #include "common.h"
+#include "promise.h"
+#include "model.h"
 
 /** Initializes a CycleGraph object. */
 CycleGraph::CycleGraph() :
@@ -195,6 +197,33 @@ bool CycleGraph::checkReachable(CycleNode *from, CycleNode *to) {
        return false;
 }
 
+bool CycleGraph::checkPromise(const ModelAction *fromact, Promise *promise) {
+       std::vector<CycleNode *, ModelAlloc<CycleNode *> > queue;
+       HashTable<CycleNode *, CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> discovered(64);
+       CycleNode *from = actionToNode.get(fromact);
+
+
+       queue.push_back(from);
+       discovered.put(from, from);
+       while(!queue.empty()) {
+               CycleNode * node=queue.back();
+               queue.pop_back();
+
+               if (promise->increment_threads(node->getAction()->get_tid())) {
+                       return true;
+               }
+
+               for(unsigned int i=0;i<node->getEdges()->size();i++) {
+                       CycleNode *next=(*node->getEdges())[i];
+                       if (!discovered.contains(next)) {
+                               discovered.put(next,next);
+                               queue.push_back(next);
+                       }
+               }
+       }
+       return false;
+}
+
 void CycleGraph::startChanges() {
        ASSERT(rollbackvector.size()==0);
        ASSERT(rmwrollbackvector.size()==0);