#include "cyclegraph.h"
#include "action.h"
#include "common.h"
+#include "promise.h"
+#include "model.h"
/** Initializes a CycleGraph object. */
CycleGraph::CycleGraph() :
void CycleGraph::addEdge(const ModelAction *from, const ModelAction *to) {
ASSERT(from);
ASSERT(to);
- ASSERT(from != to);
CycleNode *fromnode=getNode(from);
CycleNode *tonode=getNode(to);
+ if (!hasCycles) {
+ // Reflexive edges are cycles
+ hasCycles = (from == to);
+ }
if (!hasCycles) {
// Check for Cycles
hasCycles=checkReachable(tonode, fromnode);
void CycleGraph::addRMWEdge(const ModelAction *from, const ModelAction *rmw) {
ASSERT(from);
ASSERT(rmw);
- ASSERT(from != rmw);
CycleNode *fromnode=getNode(from);
CycleNode *rmwnode=getNode(rmw);
}
+ if (!hasCycles) {
+ // Reflexive edges are cycles
+ hasCycles = (from == rmw);
+ }
if (!hasCycles) {
// With promises we could be setting up a cycle here if we aren't
// careful...avoid it..
*/
bool CycleGraph::checkReachable(CycleNode *from, CycleNode *to) {
std::vector<CycleNode *, ModelAlloc<CycleNode *> > queue;
- HashTable<CycleNode *, CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> discovered;
+ HashTable<CycleNode *, CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> discovered(64);
queue.push_back(from);
discovered.put(from, from);
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);