+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
+
#include <string.h>
#include "nodestack.h"
ASSERT(act);
act->set_node(this);
int currtid = id_to_int(act->get_tid());
- int prevtid = (prevfairness != NULL) ? id_to_int(prevfairness->action->get_tid()) : 0;
+ int prevtid = prevfairness ? id_to_int(prevfairness->action->get_tid()) : 0;
if (model->params.fairwindow != 0) {
- for (int i = 0; i < nthreads; i++) {
+ for (int i = 0; i < num_threads; i++) {
ASSERT(i < ((int)fairness.size()));
struct fairness_info *fi = &fairness[i];
- struct fairness_info *prevfi = (par != NULL) && (i < par->get_num_threads()) ? &par->fairness[i] : NULL;
+ struct fairness_info *prevfi = (parent && i < parent->get_num_threads()) ? &parent->fairness[i] : NULL;
if (prevfi) {
*fi = *prevfi;
}
void Node::print()
{
action->print();
- model_print(" backtrack: %s\n", backtrack_empty() ? "empty" : "non-empty");
- model_print(" future values: %s\n", future_value_empty() ? "empty" : "non-empty");
- model_print(" read-from: %s\n", read_from_empty() ? "empty" : "non-empty");
+ model_print(" backtrack: %s", backtrack_empty() ? "empty" : "non-empty ");
+ for (int i = 0; i < (int)backtrack.size(); i++)
+ if (backtrack[i] == true)
+ model_print("[%d]", i);
+ model_print("\n");
+ model_print(" future values: %s", future_value_empty() ? "empty" : "non-empty ");
+ for (int i = future_index + 1; i < (int)future_values.size(); i++)
+ model_print("[%#" PRIx64 "]", future_values[i].value);
+ model_print("\n");
+
+ model_print(" read-from: %s", read_from_empty() ? "empty" : "non-empty ");
+ for (int i = read_from_index + 1; i < (int)may_read_from.size(); i++)
+ model_print("[%d]", may_read_from[i]->get_seq_number());
+ model_print("\n");
+
model_print(" promises: %s\n", promise_empty() ? "empty" : "non-empty");
model_print(" misc: %s\n", misc_empty() ? "empty" : "non-empty");
model_print(" rel seq break: %s\n", relseq_break_empty() ? "empty" : "non-empty");
* Sets a promise to explore meeting with the given node.
* @param i is the promise index.
*/
-void Node::set_promise(unsigned int i, bool is_rmw) {
+void Node::set_promise(unsigned int i, bool is_rmw)
+{
if (i >= promises.size())
promises.resize(i + 1, PROMISE_IGNORE);
if (promises[i] == PROMISE_IGNORE) {
* Increments to the next combination of promises.
* @return true if we have a valid combination.
*/
-bool Node::increment_promise() {
+bool Node::increment_promise()
+{
DBG();
unsigned int rmw_count = 0;
for (unsigned int i = 0; i < promises.size(); i++) {
return true;
}
-
void Node::set_misc_max(int i)
{
misc_max = i;
return misc_index;
}
-bool Node::increment_misc() {
+bool Node::increment_misc()
+{
return (misc_index < misc_max) && ((++misc_index) < misc_max);
}
return (misc_index + 1) >= misc_max;
}
-
/**
* Adds a value from a weakly ordered future write to backtrack to. This
* operation may "fail" if the future value has already been run (within some
* @param value is the value to backtrack to.
* @return True if the future value was successully added; false otherwise
*/
-bool Node::add_future_value(uint64_t value, modelclock_t expiration) {
+bool Node::add_future_value(uint64_t value, modelclock_t expiration)
+{
int idx = -1; /* Highest index where value is found */
for (unsigned int i = 0; i < future_values.size(); i++) {
if (future_values[i].value == value) {
}
/**
- * Gets the next 'future_value' value from this Node. Only valid for a node
- * where this->action is a 'read'.
+ * Gets the next 'future_value' from this Node. Only valid for a node where
+ * this->action is a 'read'.
* @return The first element in future_values
*/
-uint64_t Node::get_future_value() const
-{
- ASSERT(future_index >= 0 && future_index < ((int)future_values.size()));
- return future_values[future_index].value;
-}
-
-modelclock_t Node::get_future_value_expiration() const
+struct future_value Node::get_future_value() const
{
ASSERT(future_index >= 0 && future_index < ((int)future_values.size()));
- return future_values[future_index].expiration;
+ return future_values[future_index];
}
-
int Node::get_read_from_size() const
{
return may_read_from.size();
* Increments the index into the readsfrom set to explore the next item.
* @return Returns false if we have explored all items.
*/
-bool Node::increment_read_from() {
+bool Node::increment_read_from()
+{
DBG();
promises.clear();
if (read_from_index < may_read_from.size()) {
* Increments the index into the future_values set to explore the next item.
* @return Returns false if we have explored all values.
*/
-bool Node::increment_future_value() {
+bool Node::increment_future_value()
+{
DBG();
promises.clear();
if (future_index < ((int)future_values.size())) {