#include "common.h"
#include "promise.h"
#include "model.h"
+#include "threads-model.h"
/** Initializes a CycleGraph object. */
CycleGraph::CycleGraph() :
*/
void CycleGraph::putNode(const Promise *promise, CycleNode *node)
{
- const ModelAction *reader = promise->get_action();
- readerToPromiseNode.put(reader, node);
+ promiseToNode.put(promise, node);
#if SUPPORT_MOD_ORDER_DUMP
nodeList.push_back(node);
#endif
*/
void CycleGraph::erasePromiseNode(const Promise *promise)
{
- const ModelAction *reader = promise->get_action();
- readerToPromiseNode.put(reader, NULL);
+ promiseToNode.put(promise, NULL);
#if SUPPORT_MOD_ORDER_DUMP
/* Remove the promise node from nodeList */
CycleNode *node = getNode_noCreate(promise);
/** @return The corresponding CycleNode, if exists; otherwise NULL */
CycleNode * CycleGraph::getNode_noCreate(const Promise *promise) const
{
- return readerToPromiseNode.get(promise->get_action());
+ return promiseToNode.get(promise);
}
/**
/**
* @return false if the resolution results in a cycle; true otherwise
*/
-bool CycleGraph::resolvePromise(ModelAction *reader, ModelAction *writer,
+bool CycleGraph::resolvePromise(const Promise *promise, ModelAction *writer,
promise_list_t *mustResolve)
{
- CycleNode *promise_node = readerToPromiseNode.get(reader);
+ CycleNode *promise_node = promiseToNode.get(promise);
CycleNode *w_node = actionToNode.get(writer);
ASSERT(promise_node);
return addNodeEdge(fromnode, tonode);
}
-/* Instantiate three forms of CycleGraph::addEdge */
+/* Instantiate four forms of CycleGraph::addEdge */
template bool CycleGraph::addEdge(const ModelAction *from, const ModelAction *to);
template bool CycleGraph::addEdge(const ModelAction *from, const Promise *to);
template bool CycleGraph::addEdge(const Promise *from, const ModelAction *to);
+template bool CycleGraph::addEdge(const Promise *from, const Promise *to);
#if SUPPORT_MOD_ORDER_DUMP
-static void print_node(const CycleNode *node, FILE *file, int label)
+static void print_node(FILE *file, const CycleNode *node, int label)
{
- modelclock_t idx;
if (node->is_promise()) {
const Promise *promise = node->getPromise();
- idx = promise->get_action()->get_seq_number();
- fprintf(file, "P%u", idx);
+ int idx = model->get_promise_number(promise);
+ fprintf(file, "P%d", idx);
if (label) {
int first = 1;
- fprintf(file, " [label=\"P%u, T", idx);
+ fprintf(file, " [label=\"P%d, T", idx);
for (unsigned int i = 0 ; i < model->get_num_threads(); i++)
if (promise->thread_is_available(int_to_id(i))) {
fprintf(file, "%s%u", first ? "": ",", i);
}
} else {
const ModelAction *act = node->getAction();
- idx = act->get_seq_number();
+ 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::dumpNodes(FILE *file) const
{
for (unsigned int i = 0; i < nodeList.size(); i++) {
CycleNode *n = nodeList[i];
- print_node(n, file, 1);
+ print_node(file, n, 1);
fprintf(file, ";\n");
- if (n->getRMW() != NULL) {
- print_node(n, file, 0);
- fprintf(file, " -> ");
- print_node(n->getRMW(), file, 0);
- fprintf(file, "[style=dotted];\n");
- }
- for (unsigned int j = 0; j < n->getNumEdges(); j++) {
- print_node(n, file, 0);
- fprintf(file, " -> ");
- print_node(n->getEdge(j), file, 0);
- 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);
}
}
}
/**
- * Checks whether one ModelAction can reach another ModelAction/Promise
- * @param from The ModelAction from which to begin exploration
+ * Checks whether one ModelAction/Promise can reach another ModelAction/Promise
+ * @param from The ModelAction or Promise from which to begin exploration
* @param to The ModelAction or Promise to reach
* @return True, @a from can reach @a to; otherwise, false
*/
-template <typename T>
-bool CycleGraph::checkReachable(const ModelAction *from, const T *to) const
+template <typename T, typename U>
+bool CycleGraph::checkReachable(const T *from, const U *to) const
{
CycleNode *fromnode = getNode_noCreate(from);
CycleNode *tonode = getNode_noCreate(to);
return checkReachable(fromnode, tonode);
}
-/* Instantiate two forms of CycleGraph::checkReachable */
+/* Instantiate three forms of CycleGraph::checkReachable */
template bool CycleGraph::checkReachable(const ModelAction *from,
const ModelAction *to) const;
template bool CycleGraph::checkReachable(const ModelAction *from,
const Promise *to) const;
+template bool CycleGraph::checkReachable(const Promise *from,
+ const ModelAction *to) const;
/** @return True, if the promise has failed; false otherwise */
bool CycleGraph::checkPromise(const ModelAction *fromact, Promise *promise) const
CycleNode *node = queue.back();
queue.pop_back();
+ if (node->getPromise() == promise)
+ return true;
if (!node->is_promise() &&
promise->eliminate_thread(node->getAction()->get_tid()))
return true;
projects / model-checker.git / blobdiff