#include "action.h"
#include "common.h"
#include "promise.h"
-#include "model.h"
#include "threads-model.h"
/** Initializes a CycleGraph object. */
*/
bool CycleGraph::addNodeEdge(CycleNode *fromnode, CycleNode *tonode)
{
- bool added;
-
- if ((added = fromnode->addEdge(tonode))) {
+ if (fromnode->addEdge(tonode)) {
rollbackvector.push_back(fromnode);
if (!hasCycles)
hasCycles = checkReachable(tonode, fromnode);
- }
+ } else
+ return false; /* No new edge */
/*
- * 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 that is not the tonode, we should
+ * follow its RMW chain to add an edge at the end, unless we encounter
+ * tonode along the way
*/
CycleNode *rmwnode = fromnode->getRMW();
- if (rmwnode && rmwnode != tonode) {
- if (rmwnode->addEdge(tonode)) {
- if (!hasCycles)
- hasCycles = checkReachable(tonode, rmwnode);
+ if (rmwnode) {
+ while (rmwnode != tonode && rmwnode->getRMW())
+ rmwnode = rmwnode->getRMW();
+
+ if (rmwnode != tonode) {
+ if (rmwnode->addEdge(tonode)) {
+ if (!hasCycles)
+ hasCycles = checkReachable(tonode, rmwnode);
- rollbackvector.push_back(rmwnode);
- added = true;
+ rollbackvector.push_back(rmwnode);
+ }
}
}
- return added;
+ return true;
}
/**
*
* Handles special case of a RMW action, where the ModelAction rmw reads from
* the ModelAction/Promise 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/Promise
* @param rmw The edge points to this ModelAction; this action must read from
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;
{
if (node->is_promise()) {
const Promise *promise = node->getPromise();
- int idx = model->get_promise_number(promise);
+ int idx = promise->get_index();
fprintf(file, "P%u", idx);
if (label) {
int first = 1;
fprintf(file, " [label=\"P%d, T", idx);
- for (unsigned int i = 0 ; i < model->get_num_threads(); i++)
+ for (unsigned int i = 0 ; i < promise->max_available_thread_idx(); i++)
if (promise->thread_is_available(int_to_id(i))) {
fprintf(file, "%s%u", first ? "": ",", i);
first = 0;
return false;
}
+/** @brief Begin a new sequence of graph additions which can be rolled back */
void CycleGraph::startChanges()
{
ASSERT(rollbackvector.empty());
/**
* @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
{
return edges.size();
}
+/**
+ * @param i The index of the back edge to return
+ * @returns The CycleNode back-edge indexed by i
+ */
CycleNode * CycleNode::getBackEdge(unsigned int i) const
{
return back_edges[i];
}
+/** @returns The number of edges entering this CycleNode */
unsigned int CycleNode::getNumBackEdges() const
{
return back_edges.size();