cyclegraph: uniform spacing, style

diff --git a/cyclegraph.cc b/cyclegraph.cc
index 0528029a12e100f239b754b62492f639d8759762..51066c94601fef25bf99e021a91183b66719ad08 100644 (file)
--- a/cyclegraph.cc
+++ b/cyclegraph.cc
@@ -15,7 +15,8 @@ CycleGraph::CycleGraph() :
 }
 
 /** CycleGraph destructor */
 }
 
 /** CycleGraph destructor */

-CycleGraph::~CycleGraph() {
+CycleGraph::~CycleGraph()
+{

 }
 
 /**
 }
 
 /**


@@ -23,10 +24,11 @@ CycleGraph::~CycleGraph() {
  * @param action The ModelAction to find a node for
  * @return The CycleNode paired with this action
  */
  * @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);
-       if (node==NULL) {
-               node=new CycleNode(action);
+CycleNode * CycleGraph::getNode(const ModelAction *action)
+{
+       CycleNode *node = actionToNode.get(action);
+       if (node == NULL) {
+               node = new CycleNode(action);

                actionToNode.put(action, node);
 #if SUPPORT_MOD_ORDER_DUMP
                nodeList.push_back(node);
                actionToNode.put(action, node);
 #if SUPPORT_MOD_ORDER_DUMP
                nodeList.push_back(node);


@@ -41,12 +43,13 @@ CycleNode * CycleGraph::getNode(const ModelAction *action) {
  * @param to The edge points to this ModelAction
  * @param from The edge comes from this ModelAction
  */
  * @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) {
+void CycleGraph::addEdge(const ModelAction *from, const ModelAction *to)
+{

        ASSERT(from);
        ASSERT(to);
 
        ASSERT(from);
        ASSERT(to);
 

-       CycleNode *fromnode=getNode(from);
-       CycleNode *tonode=getNode(to);
+       CycleNode *fromnode = getNode(from);
+       CycleNode *tonode = getNode(to);

 
        if (!hasCycles) {
                // Reflexive edges are cycles
 
        if (!hasCycles) {
                // Reflexive edges are cycles


@@ -54,26 +57,27 @@ void CycleGraph::addEdge(const ModelAction *from, const ModelAction *to) {
        }
        if (!hasCycles) {
                // Check for Cycles
        }
        if (!hasCycles) {
                // Check for Cycles

-               hasCycles=checkReachable(tonode, fromnode);
+               hasCycles = checkReachable(tonode, fromnode);

        }
 
        if (fromnode->addEdge(tonode))
                rollbackvector.push_back(fromnode);
 
 
        }
 
        if (fromnode->addEdge(tonode))
                rollbackvector.push_back(fromnode);
 
 

-       CycleNode * rmwnode=fromnode->getRMW();
-
-       //If the fromnode has a rmwnode that is not the tonode, we
-       //should add an edge between its rmwnode and the tonode
-
-       //If tonode is also a rmw, don't do this check as the execution is
-       //doomed and we'll catch the problem elsewhere, but we want to allow
-       //for the possibility of sending to's write value to rmwnode
+       CycleNode *rmwnode = fromnode->getRMW();

 
 

-       if (rmwnode!=NULL&&!to->is_rmw()) {
+       /*
+        * If the fromnode has a rmwnode that is not the tonode, we should add
+        * an edge between its rmwnode and the tonode
+        *
+        * If tonode is also a rmw, don't do this check as the execution is
+        * doomed and we'll catch the problem elsewhere, but we want to allow
+        * for the possibility of sending to's write value to rmwnode
+        */
+       if (rmwnode != NULL && !to->is_rmw()) {

                if (!hasCycles) {
                        // Check for Cycles
                if (!hasCycles) {
                        // Check for Cycles

-                       hasCycles=checkReachable(tonode, rmwnode);
+                       hasCycles = checkReachable(tonode, rmwnode);

                }
 
                if (rmwnode->addEdge(tonode))
                }
 
                if (rmwnode->addEdge(tonode))


@@ -86,16 +90,17 @@ void CycleGraph::addEdge(const ModelAction *from, const ModelAction *to) {
  *  can occur in between the rmw and the from action.  Only one RMW
  *  action can read from a given write.
  */
  *  can occur in between the rmw and the from action.  Only one RMW
  *  action can read from a given write.
  */

-void CycleGraph::addRMWEdge(const ModelAction *from, const ModelAction *rmw) {
+void CycleGraph::addRMWEdge(const ModelAction *from, const ModelAction *rmw)
+{

        ASSERT(from);
        ASSERT(rmw);
 
        ASSERT(from);
        ASSERT(rmw);
 

-       CycleNode *fromnode=getNode(from);
-       CycleNode *rmwnode=getNode(rmw);
+       CycleNode *fromnode = getNode(from);
+       CycleNode *rmwnode = getNode(rmw);

 
        /* Two RMW actions cannot read from the same write. */
        if (fromnode->setRMW(rmwnode)) {
 
        /* Two RMW actions cannot read from the same write. */
        if (fromnode->setRMW(rmwnode)) {

-               hasRMWViolation=true;
+               hasRMWViolation = true;

        } else {
                rmwrollbackvector.push_back(fromnode);
        }
        } else {
                rmwrollbackvector.push_back(fromnode);
        }


@@ -109,7 +114,7 @@ void CycleGraph::addRMWEdge(const ModelAction *from, const ModelAction *rmw) {
         */
        for (unsigned int i = 0; i < fromnode->getNumEdges(); i++) {
                CycleNode *tonode = fromnode->getEdge(i);
         */
        for (unsigned int i = 0; i < fromnode->getNumEdges(); i++) {
                CycleNode *tonode = fromnode->getEdge(i);

-               if (tonode!=rmwnode) {
+               if (tonode != rmwnode) {

                        if (rmwnode->addEdge(tonode))
                                rollbackvector.push_back(rmwnode);
                }
                        if (rmwnode->addEdge(tonode))
                                rollbackvector.push_back(rmwnode);
                }


@@ -123,33 +128,35 @@ void CycleGraph::addRMWEdge(const ModelAction *from, const ModelAction *rmw) {
        if (!hasCycles) {
                // With promises we could be setting up a cycle here if we aren't
                // careful...avoid it..
        if (!hasCycles) {
                // With promises we could be setting up a cycle here if we aren't
                // careful...avoid it..

-               hasCycles=checkReachable(rmwnode, fromnode);
+               hasCycles = checkReachable(rmwnode, fromnode);

        }
        if (fromnode->addEdge(rmwnode))
                rollbackvector.push_back(fromnode);
 }
 
 #if SUPPORT_MOD_ORDER_DUMP
        }
        if (fromnode->addEdge(rmwnode))
                rollbackvector.push_back(fromnode);
 }
 
 #if SUPPORT_MOD_ORDER_DUMP

-void CycleGraph::dumpNodes(FILE *file) {
-       for (unsigned int i=0;i<nodeList.size();i++) {
-               CycleNode *cn=nodeList[i];
-               const ModelAction *action=cn->getAction();
+void CycleGraph::dumpNodes(FILE *file)
+{
+       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());
                fprintf(file, "N%u [label=\"%u, T%u\"];\n",action->get_seq_number(),action->get_seq_number(), action->get_tid());

-               if (cn->getRMW()!=NULL) {
+               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);
                        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();
+                       const ModelAction *dstaction = dst->getAction();

                        fprintf(file, "N%u -> N%u;\n", action->get_seq_number(), dstaction->get_seq_number());
                }
        }
 }
 
                        fprintf(file, "N%u -> N%u;\n", action->get_seq_number(), dstaction->get_seq_number());
                }
        }
 }
 

-void CycleGraph::dumpGraphToFile(const char *filename) {
+void CycleGraph::dumpGraphToFile(const char *filename)
+{

        char buffer[200];
        sprintf(buffer, "%s.dot",filename);
        char buffer[200];
        sprintf(buffer, "%s.dot",filename);

-       FILE *file=fopen(buffer, "w");
+       FILE *file = fopen(buffer, "w");

        fprintf(file, "digraph %s {\n",filename);
        dumpNodes(file);
        fprintf(file,"}\n");
        fprintf(file, "digraph %s {\n",filename);
        dumpNodes(file);
        fprintf(file,"}\n");


@@ -163,7 +170,8 @@ void CycleGraph::dumpGraphToFile(const char *filename) {
  * @param to The ModelAction to reach
  * @return True, @a from can reach @a to; otherwise, false
  */
  * @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) {
+bool CycleGraph::checkReachable(const ModelAction *from, const ModelAction *to)
+{

        CycleNode *fromnode = actionToNode.get(from);
        CycleNode *tonode = actionToNode.get(to);
 
        CycleNode *fromnode = actionToNode.get(from);
        CycleNode *tonode = actionToNode.get(to);
 


@@ -179,16 +187,17 @@ bool CycleGraph::checkReachable(const ModelAction *from, const ModelAction *to)
  * @param to The CycleNode to reach
  * @return True, @a from can reach @a to; otherwise, false
  */
  * @param to The CycleNode to reach
  * @return True, @a from can reach @a to; otherwise, false
  */

-bool CycleGraph::checkReachable(CycleNode *from, CycleNode *to) {
+bool CycleGraph::checkReachable(CycleNode *from, CycleNode *to)
+{

        std::vector<CycleNode *, ModelAlloc<CycleNode *> > queue;
        discovered->reset();
 
        queue.push_back(from);
        discovered->put(from, from);
        std::vector<CycleNode *, ModelAlloc<CycleNode *> > queue;
        discovered->reset();
 
        queue.push_back(from);
        discovered->put(from, from);

-       while(!queue.empty()) {
-               CycleNode * node=queue.back();
+       while (!queue.empty()) {
+               CycleNode *node = queue.back();

                queue.pop_back();
                queue.pop_back();

-               if (node==to)
+               if (node == to)

                        return true;
 
                for (unsigned int i = 0; i < node->getNumEdges(); i++) {
                        return true;
 
                for (unsigned int i = 0; i < node->getNumEdges(); i++) {


@@ -202,16 +211,16 @@ bool CycleGraph::checkReachable(CycleNode *from, CycleNode *to) {
        return false;
 }
 
        return false;
 }
 

-bool CycleGraph::checkPromise(const ModelAction *fromact, Promise *promise) {
+bool CycleGraph::checkPromise(const ModelAction *fromact, Promise *promise)
+{

        std::vector<CycleNode *, ModelAlloc<CycleNode *> > queue;
        discovered->reset();
        CycleNode *from = actionToNode.get(fromact);
 
        std::vector<CycleNode *, ModelAlloc<CycleNode *> > queue;
        discovered->reset();
        CycleNode *from = actionToNode.get(fromact);
 

-

        queue.push_back(from);
        discovered->put(from, from);
        queue.push_back(from);
        discovered->put(from, from);

-       while(!queue.empty()) {
-               CycleNode * node=queue.back();
+       while (!queue.empty()) {
+               CycleNode *node = queue.back();

                queue.pop_back();
 
                if (promise->increment_threads(node->getAction()->get_tid())) {
                queue.pop_back();
 
                if (promise->increment_threads(node->getAction()->get_tid())) {


@@ -229,19 +238,21 @@ bool CycleGraph::checkPromise(const ModelAction *fromact, Promise *promise) {
        return false;
 }
 
        return false;
 }
 

-void CycleGraph::startChanges() {
-       ASSERT(rollbackvector.size()==0);
-       ASSERT(rmwrollbackvector.size()==0);
-       ASSERT(oldCycles==hasCycles);
-       ASSERT(oldRMWViolation==hasRMWViolation);
+void CycleGraph::startChanges()
+{
+       ASSERT(rollbackvector.size() == 0);
+       ASSERT(rmwrollbackvector.size() == 0);
+       ASSERT(oldCycles == hasCycles);
+       ASSERT(oldRMWViolation == hasRMWViolation);

 }
 
 /** Commit changes to the cyclegraph. */
 }
 
 /** Commit changes to the cyclegraph. */

-void CycleGraph::commitChanges() {
+void CycleGraph::commitChanges()
+{

        rollbackvector.resize(0);
        rmwrollbackvector.resize(0);
        rollbackvector.resize(0);
        rmwrollbackvector.resize(0);

-       oldCycles=hasCycles;
-       oldRMWViolation=hasRMWViolation;
+       oldCycles = hasCycles;
+       oldRMWViolation = hasRMWViolation;

 }
 
 /** Rollback changes to the previous commit. */
 }
 
 /** Rollback changes to the previous commit. */


@@ -298,16 +309,18 @@ unsigned int CycleNode::getNumEdges() const
  * Adds an edge from this CycleNode to another CycleNode.
  * @param node The node to which we add a directed edge
  */
  * Adds an edge from this CycleNode to another CycleNode.
  * @param node The node to which we add a directed edge
  */

-bool CycleNode::addEdge(CycleNode *node) {
-       for(unsigned int i=0;i<edges.size();i++)
-               if (edges[i]==node)
+bool CycleNode::addEdge(CycleNode *node)
+{
+       for (unsigned int i = 0; i < edges.size(); i++)
+               if (edges[i] == node)

                        return false;
        edges.push_back(node);
        return true;
 }
 
 /** @returns the RMW CycleNode that reads from the current CycleNode */
                        return false;
        edges.push_back(node);
        return true;
 }
 
 /** @returns the RMW CycleNode that reads from the current CycleNode */

-CycleNode * CycleNode::getRMW() {
+CycleNode * CycleNode::getRMW() const
+{

        return hasRMW;
 }
 
        return hasRMW;
 }
 


@@ -317,9 +330,10 @@ CycleNode * CycleNode::getRMW() {
  * @return True, if this node already was read by another RMW; false otherwise
  * @see CycleGraph::addRMWEdge
  */
  * @return True, if this node already was read by another RMW; false otherwise
  * @see CycleGraph::addRMWEdge
  */

-bool CycleNode::setRMW(CycleNode *node) {
-       if (hasRMW!=NULL)
+bool CycleNode::setRMW(CycleNode *node)
+{
+       if (hasRMW != NULL)

                return true;
                return true;

-       hasRMW=node;
+       hasRMW = node;

        return false;
 }
        return false;
 }

diff --git a/cyclegraph.h b/cyclegraph.h
index 8fac5eb590c671682d48a6b8a8377bdeed21e2c2..0a6f7382a69cf78dae9b4d2bf995864b599b3912 100644 (file)
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -31,13 +31,13 @@ class CycleGraph {
        void rollbackChanges();
 #if SUPPORT_MOD_ORDER_DUMP
        void dumpNodes(FILE *file);
        void rollbackChanges();
 #if SUPPORT_MOD_ORDER_DUMP
        void dumpNodes(FILE *file);

-       void dumpGraphToFile(const char * filename);
+       void dumpGraphToFile(const char *filename);

 #endif
 
        SNAPSHOTALLOC
  private:
        CycleNode * getNode(const ModelAction *);
 #endif
 
        SNAPSHOTALLOC
  private:
        CycleNode * getNode(const ModelAction *);

-       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;

 
        /** @brief A table for mapping ModelActions to CycleNodes */
        HashTable<const ModelAction *, CycleNode *, uintptr_t, 4> actionToNode;
 
        /** @brief A table for mapping ModelActions to CycleNodes */
        HashTable<const ModelAction *, CycleNode *, uintptr_t, 4> actionToNode;


@@ -62,18 +62,18 @@ class CycleGraph {
 class CycleNode {
  public:
        CycleNode(const ModelAction *action);
 class CycleNode {
  public:
        CycleNode(const ModelAction *action);

-       bool addEdge(CycleNode * node);
+       bool addEdge(CycleNode *node);

        CycleNode * getEdge(unsigned int i) const;
        unsigned int getNumEdges() const;
        bool setRMW(CycleNode *);
        CycleNode * getEdge(unsigned int i) const;
        unsigned int getNumEdges() const;
        bool setRMW(CycleNode *);

-       CycleNode* getRMW();
-       const ModelAction * getAction() {return action;};
+       CycleNode * getRMW() const;
+       const ModelAction * getAction() const { return action; }

 
        void popEdge() {
                edges.pop_back();
 
        void popEdge() {
                edges.pop_back();

-       };
+       }

        void clearRMW() {
        void clearRMW() {

-               hasRMW=NULL;
+               hasRMW = NULL;

        }
 
        SNAPSHOTALLOC
        }
 
        SNAPSHOTALLOC


@@ -86,7 +86,7 @@ class CycleNode {
 
        /** Pointer to a RMW node that reads from this node, or NULL, if none
         * exists */
 
        /** Pointer to a RMW node that reads from this node, or NULL, if none
         * exists */

-       CycleNode * hasRMW;
+       CycleNode *hasRMW;

 };
 
 #endif
 };
 
 #endif