X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;ds=sidebyside;f=nodestack.cc;h=136e3a2eb4a2f72325db5e95e5fc9205160450b2;hb=3dbbf345d69d35d3f763fd59bb6d2bc9d9530e98;hp=71af6ef246314b0a40d373c7388418c5f4a01c82;hpb=f644ed02e576e600c6c562dd8324890aa6dedc08;p=c11tester.git diff --git a/nodestack.cc b/nodestack.cc index 71af6ef2..136e3a2e 100644 --- a/nodestack.cc +++ b/nodestack.cc @@ -1,3 +1,5 @@ +#include + #include "nodestack.h" #include "action.h" #include "common.h" @@ -17,20 +19,56 @@ * @param nthreads The number of threads which exist at this point in the * execution trace. */ -Node::Node(ModelAction *act, Node *par, int nthreads) +Node::Node(ModelAction *act, Node *par, int nthreads, Node *prevfairness) : action(act), parent(par), num_threads(nthreads), explored_children(num_threads), backtrack(num_threads), + fairness(num_threads), numBacktracks(0), + enabled_array(NULL), may_read_from(), read_from_index(0), future_values(), future_index(-1) { - if (act) + 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->enabled_array[i]) { + fi->enabled_count++; + } + if (i==currtid) { + fi->turns++; + fi->priority = false; + } + //Do window processing + if (prevfairness != NULL) { + if (prevfairness -> parent->enabled_array[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; + } + } + } + } } /** @brief Node desctructor */ @@ -38,6 +76,8 @@ Node::~Node() { if (action) delete action; + if (enabled_array) + MYFREE(enabled_array); } /** Prints debugging info for the ModelAction associated with this Node */ @@ -63,7 +103,8 @@ void Node::print_may_read_from() void Node::set_promise(unsigned int i) { if (i >= promises.size()) promises.resize(i + 1, PROMISE_IGNORE); - promises[i] = PROMISE_UNFULFILLED; + if (promises[i] == PROMISE_IGNORE) + promises[i] = PROMISE_UNFULFILLED; } /** @@ -80,6 +121,8 @@ bool Node::get_promise(unsigned int i) { * @return true if we have a valid combination. */ bool Node::increment_promise() { + DBG(); + for (unsigned int i = 0; i < promises.size(); i++) { if (promises[i] == PROMISE_UNFULFILLED) { promises[i] = PROMISE_FULFILLED; @@ -109,12 +152,24 @@ bool Node::promise_empty() { * Adds a value from a weakly ordered future write to backtrack to. * @param value is the value to backtrack to. */ -bool Node::add_future_value(uint64_t value) { - for (unsigned int i = 0; i < future_values.size(); i++) - if (future_values[i] == value) - return false; +bool Node::add_future_value(uint64_t value, modelclock_t expiration) { + int suitableindex=-1; + for (unsigned int i = 0; i < future_values.size(); i++) { + if (future_values[i].value == value) { + if (future_values[i].expiration>=expiration) + return false; + if (future_index < i) { + suitableindex=i; + } + } + } - future_values.push_back(value); + if (suitableindex!=-1) { + future_values[suitableindex].expiration=expiration; + return true; + } + struct future_value newfv={value, expiration}; + future_values.push_back(newfv); return true; } @@ -160,8 +215,17 @@ bool Node::read_from_empty() { * Mark the appropriate backtracking information for exploring a thread choice. * @param act The ModelAction to explore */ -void Node::explore_child(ModelAction *act) +void Node::explore_child(ModelAction *act, bool * is_enabled) { + if ( ! enabled_array ) + enabled_array=(bool *)MYMALLOC(sizeof(bool)*num_threads); + if (is_enabled != NULL) + memcpy(enabled_array, is_enabled, sizeof(bool)*num_threads); + else { + for(int i=0;iget_tid()); } @@ -199,7 +263,14 @@ thread_id_t Node::get_next_backtrack() bool Node::is_enabled(Thread *t) { - return id_to_int(t->get_id()) < num_threads; + int thread_id=id_to_int(t->get_id()); + return thread_id < num_threads && enabled_array[thread_id]; +} + +bool Node::is_enabled(thread_id_t tid) +{ + int thread_id=id_to_int(tid); + return thread_id < num_threads && enabled_array[thread_id]; } /** @@ -218,13 +289,23 @@ void Node::add_read_from(const ModelAction *act) */ uint64_t Node::get_future_value() { ASSERT(future_indexaction is a 'read'. @@ -242,6 +323,8 @@ const ModelAction * Node::get_read_from() { * @return Returns false if we have explored all items. */ bool Node::increment_read_from() { + DBG(); + promises.clear(); read_from_index++; return (read_from_index < may_read_from.size()); } @@ -251,6 +334,8 @@ bool Node::increment_read_from() { * @return Returns false if we have explored all values. */ bool Node::increment_future_value() { + DBG(); + promises.clear(); future_index++; return (future_index < future_values.size()); } @@ -265,58 +350,51 @@ void Node::explore(thread_id_t tid) explored_children[i] = true; } -static void clear_node_list(node_list_t *list, node_list_t::iterator start, - node_list_t::iterator end) -{ - node_list_t::iterator it; - - for (it = start; it != end; it++) - delete (*it); - list->erase(start, end); -} - NodeStack::NodeStack() : total_nodes(0) { node_list.push_back(new Node()); total_nodes++; - iter = node_list.begin(); + iter = 0; } NodeStack::~NodeStack() { - clear_node_list(&node_list, node_list.begin(), node_list.end()); } void NodeStack::print() { - node_list_t::iterator it; printf("............................................\n"); printf("NodeStack printing node_list:\n"); - for (it = node_list.begin(); it != node_list.end(); it++) { + for (unsigned int it = 0; it < node_list.size(); it++) { if (it == this->iter) printf("vvv following action is the current iterator vvv\n"); - (*it)->print(); + node_list[it]->print(); } printf("............................................\n"); } -ModelAction * NodeStack::explore_action(ModelAction *act) +/** Note: The is_enabled set contains what actions were enabled when + * act was chosen. */ + +ModelAction * NodeStack::explore_action(ModelAction *act, bool * is_enabled) { DBG(); ASSERT(!node_list.empty()); - node_list_t::iterator it=iter; - it++; - if (it != node_list.end()) { + if ((iter+1) < node_list.size()) { iter++; - return (*iter)->get_action(); + return node_list[iter]->get_action(); } /* Record action */ - get_head()->explore_child(act); - node_list.push_back(new Node(act, get_head(), model->get_num_threads())); + get_head()->explore_child(act, is_enabled); + Node *prevfairness = NULL; + if ( model->params.fairwindow != 0 && iter > model->params.fairwindow ) { + prevfairness = node_list[iter-model->params.fairwindow]; + } + node_list.push_back(new Node(act, get_head(), model->get_num_threads(), prevfairness)); total_nodes++; iter++; return NULL; @@ -333,35 +411,32 @@ ModelAction * NodeStack::explore_action(ModelAction *act) void NodeStack::pop_restofstack(int numAhead) { /* Diverging from previous execution; clear out remainder of list */ - node_list_t::iterator it = iter; - while (numAhead--) - it++; - clear_node_list(&node_list, it, node_list.end()); + unsigned int it=iter+numAhead; + node_list.resize(it); } Node * NodeStack::get_head() { if (node_list.empty()) return NULL; - return *iter; + return node_list[iter]; } Node * NodeStack::get_next() { - node_list_t::iterator it = iter; if (node_list.empty()) { DEBUG("Empty\n"); return NULL; } - it++; - if (it == node_list.end()) { + unsigned int it=iter+1; + if (it == node_list.size()) { DEBUG("At end\n"); return NULL; } - return *it; + return node_list[it]; } void NodeStack::reset_execution() { - iter = node_list.begin(); + iter = 0; }