X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=nodestack.cc;h=088fad8904b473aa603b457b188e6c9644cdd248;hp=0a15db2189c2d36f6205957f368b9c2ccfb61a19;hb=89a750a6ec0a040f73d3291e6791b3d142123f25;hpb=24032577ab44f5adb4f072d022f70d0b0162ab90 diff --git a/nodestack.cc b/nodestack.cc index 0a15db21..088fad89 100644 --- a/nodestack.cc +++ b/nodestack.cc @@ -38,41 +38,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; i < nthreads; 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; - 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; } } } @@ -81,8 +80,7 @@ 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); } @@ -90,10 +88,13 @@ Node::~Node() /** Prints debugging info for the ModelAction associated with this Node */ void Node::print() { - if (action) - action->print(); - else - model_print("******** empty action ********\n"); + 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(" 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 */ @@ -107,7 +108,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) { @@ -131,14 +133,15 @@ 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; for (unsigned int i = 0; i < promises.size(); i++) { 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)) { @@ -166,7 +169,7 @@ bool Node::increment_promise() { bool Node::promise_empty() const { bool fulfilledrmw = false; - for (int i = promises.size() - 1 ; i >= 0; i--) { + for (int i = promises.size() - 1; i >= 0; i--) { if (promises[i] == PROMISE_UNFULFILLED) return false; if (!fulfilledrmw && ((promises[i]&PROMISE_MASK) == PROMISE_UNFULFILLED)) @@ -188,8 +191,9 @@ int Node::get_misc() const return misc_index; } -bool Node::increment_misc() { - return (misc_index= 0 && future_index<((int)future_values.size())); + ASSERT(future_index >= 0 && future_index < ((int)future_values.size())); return future_values[future_index].value; } modelclock_t Node::get_future_value_expiration() const { - ASSERT(future_index >= 0 && future_index<((int)future_values.size())); + ASSERT(future_index >= 0 && future_index < ((int)future_values.size())); return future_values[future_index].expiration; } @@ -385,7 +390,8 @@ 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]; } @@ -406,7 +412,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()) { @@ -420,7 +427,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())) { @@ -486,7 +494,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--; @@ -495,8 +503,8 @@ void Node::explore(thread_id_t tid) } NodeStack::NodeStack() : - node_list(1, new Node()), - head_idx(0), + node_list(), + head_idx(-1), total_nodes(0) { total_nodes++; @@ -526,19 +534,20 @@ ModelAction * NodeStack::explore_action(ModelAction *act, enabled_type_t *is_ena { DBG(); - ASSERT(!node_list.empty()); - 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 && 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)); + 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, head, model->get_num_threads(), prevfairness)); total_nodes++; head_idx++; return NULL; @@ -556,14 +565,14 @@ void NodeStack::pop_restofstack(int numAhead) { /* Diverging from previous execution; clear out remainder of list */ unsigned int it = head_idx + numAhead; - for(unsigned int i = it; i < node_list.size(); i++) + for (unsigned int i = it; i < node_list.size(); i++) delete node_list[i]; node_list.resize(it); } Node * NodeStack::get_head() const { - if (node_list.empty()) + if (node_list.empty() || head_idx < 0) return NULL; return node_list[head_idx]; } @@ -584,5 +593,5 @@ Node * NodeStack::get_next() const void NodeStack::reset_execution() { - head_idx = 0; + head_idx = -1; }