X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=nodestack.cc;h=e5f46875649ab9bac345728ee3ef8eabd061015d;hp=d4c97652b3c08084d3b08be614638dd054f54913;hb=251c63183adee7dbdceeabce5a706e8281bc2887;hpb=ac8e176cd4a8756244c12dbbcaf961d27bfc8a74 diff --git a/nodestack.cc b/nodestack.cc index d4c9765..e5f4687 100644 --- a/nodestack.cc +++ b/nodestack.cc @@ -1,10 +1,15 @@ +#define __STDC_FORMAT_MACROS +#include + #include #include "nodestack.h" #include "action.h" #include "common.h" -#include "model.h" #include "threads-model.h" +#include "modeltypes.h" +#include "execution.h" +#include "params.h" /** * @brief Node constructor @@ -14,14 +19,19 @@ * as an empty stub, to represent the first thread "choice") and up to one * parent. * + * @param params The model-checker parameters * @param act The ModelAction to associate with this Node. May be NULL. * @param par The parent Node in the NodeStack. May be NULL if there is no * parent. * @param nthreads The number of threads which exist at this point in the * execution trace. */ -Node::Node(ModelAction *act, Node *par, int nthreads, Node *prevfairness) - : action(act), +Node::Node(const struct model_params *params, ModelAction *act, Node *par, + int nthreads, Node *prevfairness) : + read_from_status(READ_FROM_PAST), + action(act), + params(params), + uninit_action(NULL), parent(par), num_threads(nthreads), explored_children(num_threads), @@ -29,25 +39,30 @@ Node::Node(ModelAction *act, Node *par, int nthreads, Node *prevfairness) fairness(num_threads), numBacktracks(0), enabled_array(NULL), - may_read_from(), - read_from_index(0), + read_from_past(), + read_from_past_idx(0), + read_from_promises(), + read_from_promise_idx(-1), future_values(), future_index(-1), + resolve_promise(), + resolve_promise_idx(-1), relseq_break_writes(), relseq_break_index(0), misc_index(0), - misc_max(0) + misc_max(0), + yield_data(NULL) { 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++) { + if (get_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 = (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; } @@ -69,7 +84,7 @@ Node::Node(ModelAction *act, Node *par, int nthreads, Node *prevfairness) * conditions * If we meet the enabled count and have no * turns, give us priority */ - if ((fi->enabled_count >= model->params.enabledcount) && + if ((fi->enabled_count >= get_params()->enabledcount) && (fi->turns == 0)) fi->priority = true; } @@ -77,178 +92,109 @@ Node::Node(ModelAction *act, Node *par, int nthreads, Node *prevfairness) } } -/** @brief Node desctructor */ -Node::~Node() -{ - delete action; - if (enabled_array) - model_free(enabled_array); -} - -/** Prints debugging info for the ModelAction associated with this Node */ -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(" 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 */ -void Node::print_may_read_from() -{ - for (unsigned int i = 0; i < may_read_from.size(); i++) - may_read_from[i]->print(); -} - -/** - * 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) -{ - if (i >= promises.size()) - promises.resize(i + 1, PROMISE_IGNORE); - if (promises[i] == PROMISE_IGNORE) { - promises[i] = PROMISE_UNFULFILLED; - if (is_rmw) - promises[i] |= PROMISE_RMW; - } -} - -/** - * Looks up whether a given promise should be satisfied by this node. - * @param i The promise index. - * @return true if the promise should be satisfied by the given model action. - */ -bool Node::get_promise(unsigned int i) const -{ - return (i < promises.size()) && ((promises[i] & PROMISE_MASK) == PROMISE_FULFILLED); +int Node::get_yield_data(int tid1, int tid2) const { + if (tid1 0) && (promises[i] & PROMISE_RMW)) { - //sending our value to two rmws... not going to work..try next combination - continue; + int curr_tid=id_to_int(action->get_tid()); + + for(int u = 0; u < num_threads; u++) { + for(int v = 0; v < num_threads; v++) { + int yield_state=parent->get_yield_data(u, v); + bool next_enabled=scheduler->is_enabled(int_to_id(v)); + bool curr_enabled=parent->is_enabled(int_to_id(v)); + if (!next_enabled) { + //Compute intersection of ES and E + yield_state&=~YIELD_E; + //Check to see if we disabled the thread + if (u==curr_tid && curr_enabled) + yield_state|=YIELD_D; } - promises[i] = (promises[i] & PROMISE_RMW) |PROMISE_FULFILLED; - while (i > 0) { - i--; - if ((promises[i] & PROMISE_MASK) == PROMISE_FULFILLED) - promises[i] = (promises[i] & PROMISE_RMW) | PROMISE_UNFULFILLED; - } - return true; - } else if (promises[i] == (PROMISE_RMW|PROMISE_FULFILLED)) { - rmw_count--; + yield_data[YIELD_INDEX(u, v, num_threads)]=yield_state; } + yield_data[YIELD_INDEX(u, curr_tid, num_threads)]=(yield_data[YIELD_INDEX(u, curr_tid, num_threads)]&~YIELD_P)|YIELD_S; } - return false; -} - -/** - * Returns whether the promise set is empty. - * @return true if we have explored all promise combinations. - */ -bool Node::promise_empty() const -{ - 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)) - return false; - if (promises[i] == (PROMISE_FULFILLED|PROMISE_RMW)) - fulfilledrmw = true; + //handle curr.yield(t) part of computation + if (action->is_yield()) { + for(int v = 0; v < num_threads; v++) { + int yield_state=yield_data[YIELD_INDEX(curr_tid, v, num_threads)]; + if ((yield_state & (YIELD_E | YIELD_D)) && (!(yield_state & YIELD_S))) + yield_state |= YIELD_P; + yield_state &= YIELD_P; + if (scheduler->is_enabled(int_to_id(v))) { + yield_state|=YIELD_E; + } + yield_data[YIELD_INDEX(curr_tid, v, num_threads)]=yield_state; + } } - return true; -} - - -void Node::set_misc_max(int i) -{ - misc_max = i; -} - -int Node::get_misc() const -{ - return misc_index; } -bool Node::increment_misc() +/** @brief Node desctructor */ +Node::~Node() { - return (misc_index < misc_max) && ((++misc_index) < misc_max); + delete action; + if (uninit_action) + delete uninit_action; + if (enabled_array) + model_free(enabled_array); + if (yield_data) + model_free(yield_data); } -bool Node::misc_empty() const +/** Prints debugging info for the ModelAction associated with this Node */ +void Node::print() const { - return (misc_index + 1) >= misc_max; -} + action->print(); + model_print(" thread status: "); + if (enabled_array) { + for (int i = 0; i < num_threads; i++) { + char str[20]; + enabled_type_to_string(enabled_array[i], str); + model_print("[%d: %s]", i, str); + } + model_print("\n"); + } else + model_print("(info not available)\n"); + 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(" read from past: %s", read_from_past_empty() ? "empty" : "non-empty "); + for (int i = read_from_past_idx + 1; i < (int)read_from_past.size(); i++) + model_print("[%d]", read_from_past[i]->get_seq_number()); + model_print("\n"); -/** - * 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 - * sloppiness window of this expiration), or if the futurevalues set has - * reached its maximum. - * @see model_params.maxfuturevalues - * - * @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) -{ - 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 (expiration <= future_values[i].expiration) - return false; - idx = i; - } - } - if (idx > future_index) { - /* Future value hasn't been explored; update expiration */ - future_values[idx].expiration = expiration; - return true; - } else if (idx >= 0 && expiration <= future_values[idx].expiration + model->params.expireslop) { - /* Future value has been explored and is within the "sloppy" window */ - return false; - } + model_print(" read-from promises: %s", read_from_promise_empty() ? "empty" : "non-empty "); + for (int i = read_from_promise_idx + 1; i < (int)read_from_promises.size(); i++) + model_print("[%d]", read_from_promises[i]->get_seq_number()); + model_print("\n"); - /* Limit the size of the future-values set */ - if (model->params.maxfuturevalues > 0 && - (int)future_values.size() >= model->params.maxfuturevalues) - return false; + 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"); - struct future_value newfv = {value, expiration}; - future_values.push_back(newfv); - return true; + 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"); } -/** - * Checks whether the future_values set for this node is empty. - * @return true if the future_values set is empty. - */ -bool Node::future_value_empty() const -{ - return ((future_index + 1) >= ((int)future_values.size())); -} +/****************************** threads backtracking **************************/ /** * Checks if the Thread associated with this thread ID has been explored from @@ -272,13 +218,15 @@ bool Node::backtrack_empty() const return (numBacktracks == 0); } -/** - * Checks whether the readsfrom set for this node is empty. - * @return true if the readsfrom set is empty. - */ -bool Node::read_from_empty() const +void Node::explore(thread_id_t tid) { - return ((read_from_index + 1) >= may_read_from.size()); + int i = id_to_int(tid); + ASSERT(i < ((int)backtrack.size())); + if (backtrack[i]) { + backtrack[i] = false; + numBacktracks--; + } + explored_children[i] = true; } /** @@ -332,6 +280,99 @@ thread_id_t Node::get_next_backtrack() return int_to_id(i); } +void Node::clear_backtracking() +{ + for (unsigned int i = 0; i < backtrack.size(); i++) + backtrack[i] = false; + for (unsigned int i = 0; i < explored_children.size(); i++) + explored_children[i] = false; + numBacktracks = 0; +} + +/************************** end threads backtracking **************************/ + +/*********************************** promise **********************************/ + +/** + * Sets a promise to explore meeting with the given node. + * @param i is the promise index. + */ +void Node::set_promise(unsigned int i) +{ + if (i >= resolve_promise.size()) + resolve_promise.resize(i + 1, false); + resolve_promise[i] = true; +} + +/** + * Looks up whether a given promise should be satisfied by this node. + * @param i The promise index. + * @return true if the promise should be satisfied by the given ModelAction. + */ +bool Node::get_promise(unsigned int i) const +{ + return (i < resolve_promise.size()) && (int)i == resolve_promise_idx; +} + +/** + * Increments to the next promise to resolve. + * @return true if we have a valid combination. + */ +bool Node::increment_promise() +{ + DBG(); + if (resolve_promise.empty()) + return false; + int prev_idx = resolve_promise_idx; + resolve_promise_idx++; + for ( ; resolve_promise_idx < (int)resolve_promise.size(); resolve_promise_idx++) + if (resolve_promise[resolve_promise_idx]) + return true; + resolve_promise_idx = prev_idx; + return false; +} + +/** + * Returns whether the promise set is empty. + * @return true if we have explored all promise combinations. + */ +bool Node::promise_empty() const +{ + for (int i = resolve_promise_idx + 1; i < (int)resolve_promise.size(); i++) + if (i >= 0 && resolve_promise[i]) + return false; + return true; +} + +/** @brief Clear any promise-resolution information for this Node */ +void Node::clear_promise_resolutions() +{ + resolve_promise.clear(); + resolve_promise_idx = -1; +} + +/******************************* end promise **********************************/ + +void Node::set_misc_max(int i) +{ + misc_max = i; +} + +int Node::get_misc() const +{ + return misc_index; +} + +bool Node::increment_misc() +{ + return (misc_index < misc_max) && ((++misc_index) < misc_max); +} + +bool Node::misc_empty() const +{ + return (misc_index + 1) >= misc_max; +} + bool Node::is_enabled(Thread *t) const { int thread_id = id_to_int(t->get_id()); @@ -358,71 +399,265 @@ bool Node::has_priority(thread_id_t tid) const return fairness[id_to_int(tid)].priority; } +bool Node::has_priority_over(thread_id_t tid1, thread_id_t tid2) const +{ + return get_yield_data(id_to_int(tid1), id_to_int(tid2)) & YIELD_P; +} + +/*********************************** read from ********************************/ + /** - * Add an action to the may_read_from set. - * @param act is the action to add + * Get the current state of the may-read-from set iteration + * @return The read-from type we should currently be checking (past or future) */ -void Node::add_read_from(const ModelAction *act) +read_from_type_t Node::get_read_from_status() { - may_read_from.push_back(act); + if (read_from_status == READ_FROM_PAST && read_from_past.empty()) + increment_read_from(); + return read_from_status; } /** - * Gets the next 'future_value' value from this Node. Only valid for a node - * where this->action is a 'read'. - * @return The first element in future_values + * Iterate one step in the may-read-from iteration. This includes a step in + * reading from the either the past or the future. + * @return True if there is a new read-from to explore; false otherwise */ -uint64_t Node::get_future_value() const +bool Node::increment_read_from() { - ASSERT(future_index >= 0 && future_index < ((int)future_values.size())); - return future_values[future_index].value; + clear_promise_resolutions(); + if (increment_read_from_past()) { + read_from_status = READ_FROM_PAST; + return true; + } else if (increment_read_from_promise()) { + read_from_status = READ_FROM_PROMISE; + return true; + } else if (increment_future_value()) { + read_from_status = READ_FROM_FUTURE; + return true; + } + read_from_status = READ_FROM_NONE; + return false; } -modelclock_t Node::get_future_value_expiration() const +/** + * @return True if there are any new read-froms to explore + */ +bool Node::read_from_empty() const { - ASSERT(future_index >= 0 && future_index < ((int)future_values.size())); - return future_values[future_index].expiration; + return read_from_past_empty() && + read_from_promise_empty() && + future_value_empty(); } +/** + * Get the total size of the may-read-from set, including both past and future + * values + * @return The size of may-read-from + */ +unsigned int Node::read_from_size() const +{ + return read_from_past.size() + + read_from_promises.size() + + future_values.size(); +} -int Node::get_read_from_size() const +/******************************* end read from ********************************/ + +/****************************** read from past ********************************/ + +/** @brief Prints info about read_from_past set */ +void Node::print_read_from_past() { - return may_read_from.size(); + for (unsigned int i = 0; i < read_from_past.size(); i++) + read_from_past[i]->print(); } -const ModelAction * Node::get_read_from_at(int i) const +/** + * Add an action to the read_from_past set. + * @param act is the action to add + */ +void Node::add_read_from_past(const ModelAction *act) { - return may_read_from[i]; + read_from_past.push_back(act); } /** - * Gets the next 'may_read_from' action from this Node. Only valid for a node + * Gets the next 'read_from_past' action from this Node. Only valid for a node * where this->action is a 'read'. - * @return The first element in may_read_from + * @return The first element in read_from_past */ -const ModelAction * Node::get_read_from() const +const ModelAction * Node::get_read_from_past() const { - if (read_from_index < may_read_from.size()) - return may_read_from[read_from_index]; + if (read_from_past_idx < read_from_past.size()) + return read_from_past[read_from_past_idx]; else return NULL; } +const ModelAction * Node::get_read_from_past(int i) const +{ + return read_from_past[i]; +} + +int Node::get_read_from_past_size() const +{ + return read_from_past.size(); +} + +/** + * Checks whether the readsfrom set for this node is empty. + * @return true if the readsfrom set is empty. + */ +bool Node::read_from_past_empty() const +{ + return ((read_from_past_idx + 1) >= read_from_past.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_past() { DBG(); - promises.clear(); - if (read_from_index < may_read_from.size()) { - read_from_index++; - return read_from_index < may_read_from.size(); + if (read_from_past_idx < read_from_past.size()) { + read_from_past_idx++; + return read_from_past_idx < read_from_past.size(); } return false; } +/************************** end read from past ********************************/ + +/***************************** read_from_promises *****************************/ + +/** + * Add an action to the read_from_promises set. + * @param reader The read which generated the Promise; we use the ModelAction + * instead of the Promise because the Promise does not last across executions + */ +void Node::add_read_from_promise(const ModelAction *reader) +{ + read_from_promises.push_back(reader); +} + +/** + * Gets the next 'read-from-promise' from this Node. Only valid for a node + * where this->action is a 'read'. + * @return The current element in read_from_promises + */ +Promise * Node::get_read_from_promise() const +{ + ASSERT(read_from_promise_idx >= 0 && read_from_promise_idx < ((int)read_from_promises.size())); + return read_from_promises[read_from_promise_idx]->get_reads_from_promise(); +} + +/** + * Gets a particular 'read-from-promise' form this Node. Only vlaid for a node + * where this->action is a 'read'. + * @param i The index of the Promise to get + * @return The Promise at index i, if the Promise is still available; NULL + * otherwise + */ +Promise * Node::get_read_from_promise(int i) const +{ + return read_from_promises[i]->get_reads_from_promise(); +} + +/** @return The size of the read-from-promise set */ +int Node::get_read_from_promise_size() const +{ + return read_from_promises.size(); +} + +/** + * Checks whether the read_from_promises set for this node is empty. + * @return true if the read_from_promises set is empty. + */ +bool Node::read_from_promise_empty() const +{ + return ((read_from_promise_idx + 1) >= ((int)read_from_promises.size())); +} + +/** + * Increments the index into the read_from_promises set to explore the next item. + * @return Returns false if we have explored all promises. + */ +bool Node::increment_read_from_promise() +{ + DBG(); + if (read_from_promise_idx < ((int)read_from_promises.size())) { + read_from_promise_idx++; + return (read_from_promise_idx < ((int)read_from_promises.size())); + } + return false; +} + +/************************* end read_from_promises *****************************/ + +/****************************** future values *********************************/ + +/** + * 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 + * sloppiness window of this expiration), or if the futurevalues set has + * reached its maximum. + * @see model_params.maxfuturevalues + * + * @param value is the value to backtrack to. + * @return True if the future value was successully added; false otherwise + */ +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 && future_values[i].tid == tid) { + if (expiration <= future_values[i].expiration) + return false; + idx = i; + } + } + if (idx > future_index) { + /* Future value hasn't been explored; update expiration */ + future_values[idx].expiration = expiration; + return true; + } else if (idx >= 0 && expiration <= future_values[idx].expiration + get_params()->expireslop) { + /* Future value has been explored and is within the "sloppy" window */ + return false; + } + + /* Limit the size of the future-values set */ + if (get_params()->maxfuturevalues > 0 && + (int)future_values.size() >= get_params()->maxfuturevalues) + return false; + + future_values.push_back(fv); + return true; +} + +/** + * 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 + */ +struct future_value Node::get_future_value() const +{ + ASSERT(future_index >= 0 && future_index < ((int)future_values.size())); + return future_values[future_index]; +} + +/** + * Checks whether the future_values set for this node is empty. + * @return true if the future_values set is empty. + */ +bool Node::future_value_empty() const +{ + return ((future_index + 1) >= ((int)future_values.size())); +} + /** * Increments the index into the future_values set to explore the next item. * @return Returns false if we have explored all values. @@ -430,7 +665,6 @@ bool Node::increment_read_from() bool Node::increment_future_value() { DBG(); - promises.clear(); if (future_index < ((int)future_values.size())) { future_index++; return (future_index < ((int)future_values.size())); @@ -438,6 +672,10 @@ bool Node::increment_future_value() return false; } +/************************** end future values *********************************/ + +/*********************** breaking release sequences ***************************/ + /** * Add a write ModelAction to the set of writes that may break the release * sequence. This is used during replay exploration of pending release @@ -474,7 +712,6 @@ const ModelAction * Node::get_relseq_break() const bool Node::increment_relseq_break() { DBG(); - promises.clear(); if (relseq_break_index < ((int)relseq_break_writes.size())) { relseq_break_index++; return (relseq_break_index < ((int)relseq_break_writes.size())); @@ -491,15 +728,27 @@ bool Node::relseq_break_empty() const return ((relseq_break_index + 1) >= ((int)relseq_break_writes.size())); } -void Node::explore(thread_id_t tid) +/******************* end breaking release sequences ***************************/ + +/** + * Increments some behavior's index, if a new behavior is available + * @return True if there is a new behavior available; otherwise false + */ +bool Node::increment_behaviors() { - int i = id_to_int(tid); - ASSERT(i < ((int)backtrack.size())); - if (backtrack[i]) { - backtrack[i] = false; - numBacktracks--; - } - explored_children[i] = true; + /* satisfy a different misc_index values */ + if (increment_misc()) + return true; + /* satisfy a different set of promises */ + if (increment_promise()) + return true; + /* read from a different value */ + if (increment_read_from()) + return true; + /* resolve a release sequence differently */ + if (increment_relseq_break()) + return true; + return false; } NodeStack::NodeStack() : @@ -516,6 +765,20 @@ NodeStack::~NodeStack() delete node_list[i]; } +/** + * @brief Register the model-checker object with this NodeStack + * @param exec The execution structure for the ModelChecker + */ +void NodeStack::register_engine(const ModelExecution *exec) +{ + this->execution = exec; +} + +const struct model_params * NodeStack::get_params() const +{ + return execution->get_params(); +} + void NodeStack::print() const { model_print("............................................\n"); @@ -544,10 +807,14 @@ ModelAction * NodeStack::explore_action(ModelAction *act, enabled_type_t *is_ena Node *prevfairness = NULL; 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]; + if (get_params()->fairwindow != 0 && head_idx > (int)get_params()->fairwindow) + prevfairness = node_list[head_idx - get_params()->fairwindow]; } - node_list.push_back(new Node(act, head, model->get_num_threads(), prevfairness)); + + int next_threads = execution->get_num_threads(); + if (act->get_type() == THREAD_CREATE) + next_threads++; + node_list.push_back(new Node(get_params(), act, head, next_threads, prevfairness)); total_nodes++; head_idx++; return NULL; @@ -568,6 +835,7 @@ void NodeStack::pop_restofstack(int numAhead) for (unsigned int i = it; i < node_list.size(); i++) delete node_list[i]; node_list.resize(it); + node_list.back()->clear_backtracking(); } Node * NodeStack::get_head() const