X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=cyclegraph.cc;h=47951d4eb645b8f181b3afe6e5cc01ad49260dc4;hp=89c3f2ca39675ed048639e8e57428037ad88cc7f;hb=f346ab3d093634eb5fcd60aec0893081f39a85fb;hpb=79c9efc15ba00325f4da4d9d8a96a4042046260d diff --git a/cyclegraph.cc b/cyclegraph.cc index 89c3f2ca..47951d4e 100644 --- a/cyclegraph.cc +++ b/cyclegraph.cc @@ -1,21 +1,19 @@ #include "cyclegraph.h" #include "action.h" #include "common.h" -#include "promise.h" -#include "model.h" +#include "threads-model.h" +#include "clockvector.h" /** Initializes a CycleGraph object. */ CycleGraph::CycleGraph() : - discovered(new HashTable(16)), - hasCycles(false), - oldCycles(false) + queue(new SnapVector()) { } /** CycleGraph destructor */ CycleGraph::~CycleGraph() { - delete discovered; + delete queue; } /** @@ -31,14 +29,23 @@ void CycleGraph::putNode(const ModelAction *act, CycleNode *node) #endif } +/** @return The corresponding CycleNode, if exists; otherwise NULL */ +CycleNode * CycleGraph::getNode_noCreate(const ModelAction *act) const +{ + return actionToNode.get(act); +} + /** * @brief Returns the CycleNode corresponding to a given ModelAction + * + * Gets (or creates, if none exist) a CycleNode corresponding to a ModelAction + * * @param action The ModelAction to find a node for * @return The CycleNode paired with this action */ CycleNode * CycleGraph::getNode(const ModelAction *action) { - CycleNode *node = actionToNode.get(action); + CycleNode *node = getNode_noCreate(action); if (node == NULL) { node = new CycleNode(action); putNode(action, node); @@ -46,47 +53,45 @@ CycleNode * CycleGraph::getNode(const ModelAction *action) return node; } -/** - * Adds an edge between two ModelActions. The ModelAction @a to is ordered - * after the ModelAction @a from. - * @param to The edge points to this ModelAction - * @param from The edge comes from this ModelAction - */ -void CycleGraph::addEdge(const ModelAction *from, const ModelAction *to) -{ - ASSERT(from); - ASSERT(to); - - CycleNode *fromnode = getNode(from); - CycleNode *tonode = getNode(to); - - addNodeEdge(fromnode, tonode); -} - /** * Adds an edge between two CycleNodes. * @param fromnode The edge comes from this CycleNode * @param tonode The edge points to this CycleNode + * @return True, if new edge(s) are added; otherwise false */ -void CycleGraph::addNodeEdge(CycleNode *fromnode, CycleNode *tonode) +void CycleGraph::addNodeEdge(CycleNode *fromnode, CycleNode *tonode, bool forceedge) { - if (!hasCycles) - hasCycles = checkReachable(tonode, fromnode); - - if (fromnode->addEdge(tonode)) - rollbackvector.push_back(fromnode); + //quick check whether edge is redundant + if (checkReachable(fromnode, tonode) && !forceedge) { + return; + } /* - * If the fromnode has a rmwnode that is not the tonode, we should add - * an edge between its rmwnode and the tonode + * If the fromnode has a rmwnode, we should + * follow its RMW chain to add an edge at the end. */ - CycleNode *rmwnode = fromnode->getRMW(); - if (rmwnode && rmwnode != tonode) { - if (!hasCycles) - hasCycles = checkReachable(tonode, rmwnode); + while (fromnode->getRMW()) { + CycleNode *nextnode = fromnode->getRMW(); + if (nextnode == tonode) + break; + fromnode = nextnode; + } - if (rmwnode->addEdge(tonode)) - rollbackvector.push_back(rmwnode); + fromnode->addEdge(tonode); //Add edge to edgeSrcNode + + /* Propagate clock vector changes */ + if (tonode->cv->merge(fromnode->cv)) { + queue->push_back(fromnode); + while(!queue->empty()) { + const CycleNode *node = queue->back(); + queue->pop_back(); + unsigned int numedges = node->getNumEdges(); + for(unsigned int i = 0;i < numedges;i++) { + CycleNode * enode = node->getEdge(i); + if (enode->cv->merge(node->cv)) + queue->push_back(enode); + } + } } } @@ -95,12 +100,12 @@ void CycleGraph::addNodeEdge(CycleNode *fromnode, CycleNode *tonode) * * Handles special case of a RMW action, where the ModelAction rmw reads from * the ModelAction from. The key differences are: - * (1) no write can occur in between the rmw and the from action. - * (2) Only one RMW action can read from a given write. + * -# No write can occur in between the @a rmw and @a from actions. + * -# Only one RMW action can read from a given write. * * @param from The edge comes from this ModelAction * @param rmw The edge points to this ModelAction; this action must read from - * ModelAction from + * the ModelAction from */ void CycleGraph::addRMWEdge(const ModelAction *from, const ModelAction *rmw) { @@ -109,12 +114,10 @@ void CycleGraph::addRMWEdge(const ModelAction *from, const ModelAction *rmw) CycleNode *fromnode = getNode(from); CycleNode *rmwnode = getNode(rmw); + /* We assume that this RMW has no RMW reading from it yet */ + ASSERT(!rmwnode->getRMW()); - /* Two RMW actions cannot read from the same write. */ - if (fromnode->setRMW(rmwnode)) - hasCycles = true; - else - rmwrollbackvector.push_back(fromnode); + fromnode->setRMW(rmwnode); /* Transfer all outgoing edges from the from node to the rmw node */ /* This process should not add a cycle because either: @@ -123,32 +126,97 @@ void CycleGraph::addRMWEdge(const ModelAction *from, const ModelAction *rmw) * (2) the fromnode is the new node and therefore it should not * have any outgoing edges. */ - for (unsigned int i = 0; i < fromnode->getNumEdges(); i++) { + for (unsigned int i = 0;i < fromnode->getNumEdges();i++) { CycleNode *tonode = fromnode->getEdge(i); if (tonode != rmwnode) { - if (rmwnode->addEdge(tonode)) - rollbackvector.push_back(rmwnode); + rmwnode->addEdge(tonode); } } + fromnode->edges.clear(); + + addNodeEdge(fromnode, rmwnode, true); +} + +/** + * @brief Adds an edge between objects + * + * This function will add an edge between any two objects which can be + * associated with a CycleNode. That is, if they have a CycleGraph::getNode + * implementation. + * + * The object to is ordered after the object from. + * + * @param to The edge points to this object, of type T + * @param from The edge comes from this object, of type U + * @return True, if new edge(s) are added; otherwise false + */ + +void CycleGraph::addEdge(const ModelAction *from, const ModelAction *to) +{ + ASSERT(from); + ASSERT(to); + + CycleNode *fromnode = getNode(from); + CycleNode *tonode = getNode(to); + + addNodeEdge(fromnode, tonode, false); +} + +void CycleGraph::addEdge(const ModelAction *from, const ModelAction *to, bool forceedge) +{ + ASSERT(from); + ASSERT(to); - addNodeEdge(fromnode, rmwnode); + CycleNode *fromnode = getNode(from); + CycleNode *tonode = getNode(to); + + addNodeEdge(fromnode, tonode, forceedge); } #if SUPPORT_MOD_ORDER_DUMP + +static void print_node(FILE *file, const CycleNode *node, int label) +{ + const ModelAction *act = node->getAction(); + modelclock_t idx = act->get_seq_number(); + fprintf(file, "N%u", idx); + if (label) + fprintf(file, " [label=\"N%u, T%u\"]", idx, act->get_tid()); +} + +static void print_edge(FILE *file, const CycleNode *from, const CycleNode *to, const char *prop) +{ + print_node(file, from, 0); + fprintf(file, " -> "); + print_node(file, to, 0); + if (prop && strlen(prop)) + fprintf(file, " [%s]", prop); + fprintf(file, ";\n"); +} + +void CycleGraph::dot_print_node(FILE *file, const ModelAction *act) +{ + print_node(file, getNode(act), 1); +} + +void CycleGraph::dot_print_edge(FILE *file, const ModelAction *from, const ModelAction *to, const char *prop) +{ + CycleNode *fromnode = getNode(from); + CycleNode *tonode = getNode(to); + + print_edge(file, fromnode, tonode, prop); +} + void CycleGraph::dumpNodes(FILE *file) const { - for (unsigned int i = 0; i < nodeList.size(); i++) { - CycleNode *cn = nodeList[i]; - const ModelAction *action = cn->getAction(); - fprintf(file, "N%u [label=\"%u, T%u\"];\n", action->get_seq_number(), action->get_seq_number(), action->get_tid()); - if (cn->getRMW() != NULL) { - fprintf(file, "N%u -> N%u[style=dotted];\n", action->get_seq_number(), cn->getRMW()->getAction()->get_seq_number()); - } - for (unsigned int j = 0; j < cn->getNumEdges(); j++) { - CycleNode *dst = cn->getEdge(j); - const ModelAction *dstaction = dst->getAction(); - fprintf(file, "N%u -> N%u;\n", action->get_seq_number(), dstaction->get_seq_number()); - } + for (unsigned int i = 0;i < nodeList.size();i++) { + CycleNode *n = nodeList[i]; + print_node(file, n, 1); + fprintf(file, ";\n"); + if (n->getRMW()) + print_edge(file, n, n->getRMW(), "style=dotted"); + for (unsigned int j = 0;j < n->getNumEdges();j++) + print_edge(file, n, n->getEdge(j), NULL); } } @@ -164,23 +232,6 @@ void CycleGraph::dumpGraphToFile(const char *filename) const } #endif -/** - * Checks whether one ModelAction can reach another. - * @param from The ModelAction from which to begin exploration - * @param to The ModelAction to reach - * @return True, @a from can reach @a to; otherwise, false - */ -bool CycleGraph::checkReachable(const ModelAction *from, const ModelAction *to) const -{ - CycleNode *fromnode = actionToNode.get(from); - CycleNode *tonode = actionToNode.get(to); - - if (!fromnode || !tonode) - return false; - - return checkReachable(fromnode, tonode); -} - /** * Checks whether one CycleNode can reach another. * @param from The CycleNode from which to begin exploration @@ -189,88 +240,24 @@ bool CycleGraph::checkReachable(const ModelAction *from, const ModelAction *to) */ bool CycleGraph::checkReachable(const CycleNode *from, const CycleNode *to) const { - std::vector< const CycleNode *, ModelAlloc > queue; - discovered->reset(); - - queue.push_back(from); - discovered->put(from, from); - while (!queue.empty()) { - const CycleNode *node = queue.back(); - queue.pop_back(); - if (node == to) - return true; - - for (unsigned int i = 0; i < node->getNumEdges(); i++) { - CycleNode *next = node->getEdge(i); - if (!discovered->contains(next)) { - discovered->put(next, next); - queue.push_back(next); - } - } - } - return false; + return to->cv->synchronized_since(from->action); } -bool CycleGraph::checkPromise(const ModelAction *fromact, Promise *promise) const -{ - std::vector< CycleNode *, ModelAlloc > queue; - discovered->reset(); - 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->eliminate_thread(node->getAction()->get_tid())) { - return true; - } - - for (unsigned int i = 0; i < node->getNumEdges(); i++) { - CycleNode *next = node->getEdge(i); - if (!discovered->contains(next)) { - discovered->put(next, next); - queue.push_back(next); - } - } - } - return false; -} - -void CycleGraph::startChanges() -{ - ASSERT(rollbackvector.empty()); - ASSERT(rmwrollbackvector.empty()); - ASSERT(oldCycles == hasCycles); -} - -/** Commit changes to the cyclegraph. */ -void CycleGraph::commitChanges() -{ - rollbackvector.clear(); - rmwrollbackvector.clear(); - oldCycles = hasCycles; -} - -/** Rollback changes to the previous commit. */ -void CycleGraph::rollbackChanges() +/** + * Checks whether one ModelAction can reach another ModelAction + * @param from The ModelAction from which to begin exploration + * @param to The ModelAction to reach + * @return True, @a from can reach @a to; otherwise, false + */ +bool CycleGraph::checkReachable(const ModelAction *from, const ModelAction *to) const { - for (unsigned int i = 0; i < rollbackvector.size(); i++) - rollbackvector[i]->popEdge(); + CycleNode *fromnode = getNode_noCreate(from); + CycleNode *tonode = getNode_noCreate(to); - for (unsigned int i = 0; i < rmwrollbackvector.size(); i++) - rmwrollbackvector[i]->clearRMW(); - - hasCycles = oldCycles; - rollbackvector.clear(); - rmwrollbackvector.clear(); -} + if (!fromnode || !tonode) + return false; -/** @returns whether a CycleGraph contains cycles. */ -bool CycleGraph::checkForCycles() const -{ - return hasCycles; + return checkReachable(fromnode, tonode); } /** @@ -279,25 +266,14 @@ bool CycleGraph::checkForCycles() const */ CycleNode::CycleNode(const ModelAction *act) : action(act), - promise(NULL), - hasRMW(NULL) -{ -} - -/** - * @brief Constructor for a Promise CycleNode - * @param promise The Promise which was generated - */ -CycleNode::CycleNode(const Promise *promise) : - action(NULL), - promise(promise), - hasRMW(NULL) + hasRMW(NULL), + cv(new ClockVector(NULL, act)) { } /** * @param i The index of the edge to return - * @returns The a CycleNode edge indexed by i + * @returns The CycleNode edge indexed by i */ CycleNode * CycleNode::getEdge(unsigned int i) const { @@ -310,34 +286,6 @@ unsigned int CycleNode::getNumEdges() const return edges.size(); } -CycleNode * CycleNode::getBackEdge(unsigned int i) const -{ - return back_edges[i]; -} - -unsigned int CycleNode::getNumBackEdges() const -{ - return back_edges.size(); -} - -/** - * @brief Remove an element from a vector - * @param v The vector - * @param n The element to remove - * @return True if the element was found; false otherwise - */ -template -static bool vector_remove_node(std::vector >& v, const T n) -{ - for (unsigned int i = 0; i < v.size(); i++) { - if (v[i] == n) { - v.erase(v.begin() + i); - return true; - } - } - return false; -} - /** * @brief Remove a (forward) edge from this CycleNode * @return The CycleNode which was popped, if one exists; otherwise NULL @@ -349,22 +297,6 @@ CycleNode * CycleNode::removeEdge() CycleNode *ret = edges.back(); edges.pop_back(); - vector_remove_node(ret->back_edges, this); - return ret; -} - -/** - * @brief Remove a (back) edge from this CycleNode - * @return The CycleNode which was popped, if one exists; otherwise NULL - */ -CycleNode * CycleNode::removeBackEdge() -{ - if (back_edges.empty()) - return NULL; - - CycleNode *ret = back_edges.back(); - back_edges.pop_back(); - vector_remove_node(ret->edges, this); return ret; } @@ -373,14 +305,12 @@ CycleNode * CycleNode::removeBackEdge() * @param node The node to which we add a directed edge * @return True if this edge is a new edge; false otherwise */ -bool CycleNode::addEdge(CycleNode *node) +void CycleNode::addEdge(CycleNode *node) { - for (unsigned int i = 0; i < edges.size(); i++) + for (unsigned int i = 0;i < edges.size();i++) if (edges[i] == node) - return false; + return; edges.push_back(node); - node->back_edges.push_back(this); - return true; } /** @returns the RMW CycleNode that reads from the current CycleNode */