X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=nodestack.cc;h=addf93f67469f1cd7f96a15ffad8ec5551cb1c1b;hp=f0d79245cd8aa2e648a5071f50e66e48f5bdc3d9;hb=24d17393dc45f60f6f6660159f2f329d1cc5d15a;hpb=2cf946f3bf4f12d2a353fb0c4f4644a6b2f65e56 diff --git a/nodestack.cc b/nodestack.cc index f0d7924..addf93f 100644 --- a/nodestack.cc +++ b/nodestack.cc @@ -1,3 +1,6 @@ +#define __STDC_FORMAT_MACROS +#include + #include #include "nodestack.h" @@ -5,6 +8,7 @@ #include "common.h" #include "model.h" #include "threads-model.h" +#include "modeltypes.h" /** * @brief Node constructor @@ -38,39 +42,40 @@ Node::Node(ModelAction *act, Node *par, int nthreads, Node *prevfairness) misc_index(0), misc_max(0) { - if (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; - - if ( model->params.fairwindow != 0 ) { - for(int i=0;iget_num_threads())?&par->fairness[i]:NULL; - if (prevfi) { - *fi=*prevfi; - } - if (parent->is_enabled(int_to_id(i))) { - fi->enabled_count++; - } - if (i==currtid) { - fi->turns++; - fi->priority = false; - } - //Do window processing - if (prevfairness != NULL) { - if (prevfairness -> parent->is_enabled(int_to_id(i))) - fi->enabled_count--; - if (i==prevtid) { - fi->turns--; - } - //Need full window to start evaluating conditions - //If we meet the enabled count and have no turns, give us priority - if ((fi->enabled_count >= model->params.enabledcount) && - (fi->turns == 0)) - fi->priority = true; + ASSERT(act); + act->set_node(this); + int currtid = id_to_int(act->get_tid()); + int prevtid = prevfairness ? id_to_int(prevfairness->action->get_tid()) : 0; + + if (model->params.fairwindow != 0) { + for (int i = 0; i < num_threads; i++) { + ASSERT(i < ((int)fairness.size())); + struct fairness_info *fi = &fairness[i]; + struct fairness_info *prevfi = (parent && i < parent->get_num_threads()) ? &parent->fairness[i] : NULL; + if (prevfi) { + *fi = *prevfi; + } + if (parent && parent->is_enabled(int_to_id(i))) { + fi->enabled_count++; + } + if (i == currtid) { + fi->turns++; + fi->priority = false; + } + /* Do window processing */ + if (prevfairness != NULL) { + if (prevfairness->parent->is_enabled(int_to_id(i))) + fi->enabled_count--; + if (i == prevtid) { + fi->turns--; } + /* Need full window to start evaluating + * conditions + * If we meet the enabled count and have no + * turns, give us priority */ + if ((fi->enabled_count >= model->params.enabledcount) && + (fi->turns == 0)) + fi->priority = true; } } } @@ -79,19 +84,33 @@ Node::Node(ModelAction *act, Node *par, int nthreads, Node *prevfairness) /** @brief Node desctructor */ Node::~Node() { - if (action) - delete action; + delete action; if (enabled_array) model_free(enabled_array); } /** Prints debugging info for the ModelAction associated with this Node */ -void Node::print() +void Node::print() const { - if (action) - action->print(); - else - model_print("******** empty action ********\n"); + action->print(); + 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"); } /** @brief Prints info about may_read_from set */ @@ -105,7 +124,8 @@ void Node::print_may_read_from() * 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) { @@ -129,21 +149,22 @@ bool Node::get_promise(unsigned int i) const * 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; + unsigned int rmw_count = 0; for (unsigned int i = 0; i < promises.size(); i++) { - if (promises[i]==(PROMISE_RMW|PROMISE_FULFILLED)) + if (promises[i] == (PROMISE_RMW|PROMISE_FULFILLED)) rmw_count++; } - + for (unsigned int i = 0; i < promises.size(); i++) { if ((promises[i] & PROMISE_MASK) == PROMISE_UNFULFILLED) { if ((rmw_count > 0) && (promises[i] & PROMISE_RMW)) { //sending our value to two rmws... not going to work..try next combination continue; } - promises[i] = (promises[i] & PROMISE_RMW) |PROMISE_FULFILLED; + promises[i] = (promises[i] & PROMISE_RMW) | PROMISE_FULFILLED; while (i > 0) { i--; if ((promises[i] & PROMISE_MASK) == PROMISE_FULFILLED) @@ -163,21 +184,21 @@ bool Node::increment_promise() { */ bool Node::promise_empty() const { - bool fulfilledrmw=false; - for (int i = promises.size()-1 ; i>=0; i--) { - if (promises[i]==PROMISE_UNFULFILLED) + bool fulfilledrmw = false; + for (int i = promises.size() - 1; i >= 0; i--) { + if (promises[i] == PROMISE_UNFULFILLED) return false; - if (!fulfilledrmw && ((promises[i]&PROMISE_MASK)==PROMISE_UNFULFILLED)) + if (!fulfilledrmw && ((promises[i] & PROMISE_MASK) == PROMISE_UNFULFILLED)) return false; - if (promises[i]==(PROMISE_FULFILLED|PROMISE_RMW)) - fulfilledrmw=true; + if (promises[i] == (PROMISE_FULFILLED | PROMISE_RMW)) + fulfilledrmw = true; } return true; } - -void Node::set_misc_max(int i) { - misc_max=i; +void Node::set_misc_max(int i) +{ + misc_max = i; } int Node::get_misc() const @@ -185,16 +206,16 @@ int Node::get_misc() const return misc_index; } -bool Node::increment_misc() { - return (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 @@ -205,10 +226,14 @@ bool Node::misc_empty() const * @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(struct future_value& fv) +{ + uint64_t value = fv.value; + modelclock_t expiration = fv.expiration; + thread_id_t tid = fv.tid; 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) { + if (future_values[i].value == value && future_values[i].tid == tid) { if (expiration <= future_values[i].expiration) return false; idx = i; @@ -228,8 +253,7 @@ bool Node::add_future_value(uint64_t value, modelclock_t expiration) { (int)future_values.size() >= model->params.maxfuturevalues) return false; - struct future_value newfv = {value, expiration}; - future_values.push_back(newfv); + future_values.push_back(fv); return true; } @@ -270,22 +294,22 @@ bool Node::backtrack_empty() const */ bool Node::read_from_empty() const { - return ((read_from_index+1) >= may_read_from.size()); + return ((read_from_index + 1) >= may_read_from.size()); } /** * Mark the appropriate backtracking information for exploring a thread choice. * @param act The ModelAction to explore */ -void Node::explore_child(ModelAction *act, enabled_type_t * is_enabled) +void Node::explore_child(ModelAction *act, enabled_type_t *is_enabled) { - if ( ! enabled_array ) - enabled_array=(enabled_type_t *)model_malloc(sizeof(enabled_type_t)*num_threads); + if (!enabled_array) + enabled_array = (enabled_type_t *)model_malloc(sizeof(enabled_type_t) * num_threads); if (is_enabled != NULL) - memcpy(enabled_array, is_enabled, sizeof(enabled_type_t)*num_threads); + memcpy(enabled_array, is_enabled, sizeof(enabled_type_t) * num_threads); else { - for(int i=0;iget_tid()); @@ -301,7 +325,7 @@ void Node::explore_child(ModelAction *act, enabled_type_t * is_enabled) bool Node::set_backtrack(thread_id_t id) { int i = id_to_int(id); - ASSERT(i<((int)backtrack.size())); + ASSERT(i < ((int)backtrack.size())); if (backtrack[i]) return false; backtrack[i] = true; @@ -326,7 +350,7 @@ thread_id_t Node::get_next_backtrack() bool Node::is_enabled(Thread *t) const { - int thread_id=id_to_int(t->get_id()); + int thread_id = id_to_int(t->get_id()); return thread_id < num_threads && (enabled_array[thread_id] != THREAD_DISABLED); } @@ -341,7 +365,7 @@ enabled_type_t Node::enabled_status(thread_id_t tid) const bool Node::is_enabled(thread_id_t tid) const { - int thread_id=id_to_int(tid); + int thread_id = id_to_int(tid); return thread_id < num_threads && (enabled_array[thread_id] != THREAD_DISABLED); } @@ -360,29 +384,23 @@ void Node::add_read_from(const ModelAction *act) } /** - * 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 +struct future_value Node::get_future_value() const { - ASSERT(future_index >= 0 && future_index<((int)future_values.size())); - return future_values[future_index].value; + ASSERT(future_index >= 0 && future_index < ((int)future_values.size())); + return future_values[future_index]; } -modelclock_t Node::get_future_value_expiration() const -{ - ASSERT(future_index >= 0 && future_index<((int)future_values.size())); - return future_values[future_index].expiration; -} - - int Node::get_read_from_size() const { return may_read_from.size(); } -const ModelAction * Node::get_read_from_at(int i) { +const ModelAction * Node::get_read_from_at(int i) const +{ return may_read_from[i]; } @@ -403,7 +421,8 @@ const ModelAction * Node::get_read_from() const * 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()) { @@ -417,7 +436,8 @@ bool Node::increment_read_from() { * 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())) { @@ -483,7 +503,7 @@ bool Node::relseq_break_empty() const void Node::explore(thread_id_t tid) { int i = id_to_int(tid); - ASSERT(i<((int)backtrack.size())); + ASSERT(i < ((int)backtrack.size())); if (backtrack[i]) { backtrack[i] = false; numBacktracks--; @@ -492,8 +512,8 @@ void Node::explore(thread_id_t tid) } NodeStack::NodeStack() : - node_list(1, new Node()), - iter(0), + node_list(), + head_idx(-1), total_nodes(0) { total_nodes++; @@ -510,7 +530,7 @@ void NodeStack::print() const model_print("............................................\n"); model_print("NodeStack printing node_list:\n"); for (unsigned int it = 0; it < node_list.size(); it++) { - if (it == this->iter) + if ((int)it == this->head_idx) model_print("vvv following action is the current iterator vvv\n"); node_list[it]->print(); } @@ -519,27 +539,26 @@ void NodeStack::print() const /** Note: The is_enabled set contains what actions were enabled when * act was chosen. */ - -ModelAction * NodeStack::explore_action(ModelAction *act, enabled_type_t * is_enabled) +ModelAction * NodeStack::explore_action(ModelAction *act, enabled_type_t *is_enabled) { DBG(); - ASSERT(!node_list.empty()); - - if ((iter+1) < node_list.size()) { - iter++; - return node_list[iter]->get_action(); + if ((head_idx + 1) < (int)node_list.size()) { + head_idx++; + return node_list[head_idx]->get_action(); } /* Record action */ - get_head()->explore_child(act, is_enabled); + Node *head = get_head(); Node *prevfairness = NULL; - if ( model->params.fairwindow != 0 && iter > model->params.fairwindow ) { - prevfairness = node_list[iter-model->params.fairwindow]; + if (head) { + head->explore_child(act, is_enabled); + if (model->params.fairwindow != 0 && head_idx > (int)model->params.fairwindow) + prevfairness = node_list[head_idx - model->params.fairwindow]; } - node_list.push_back(new Node(act, get_head(), model->get_num_threads(), prevfairness)); + node_list.push_back(new Node(act, head, model->get_num_threads(), prevfairness)); total_nodes++; - iter++; + head_idx++; return NULL; } @@ -554,17 +573,17 @@ ModelAction * NodeStack::explore_action(ModelAction *act, enabled_type_t * is_en void NodeStack::pop_restofstack(int numAhead) { /* Diverging from previous execution; clear out remainder of list */ - unsigned int it=iter+numAhead; - for(unsigned int i=it;i