fix bug in promise handling code...
[model-checker.git] / nodestack.cc
index 58741f747b486addea103f6e695f7cb7dd425cd7..ec72def002838b97429d3a27a99e0fd3825aecc0 100644 (file)
@@ -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,17 @@ 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", 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\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 +112,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,7 +137,8 @@ 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++) {
@@ -188,7 +195,8 @@ int Node::get_misc() const
        return misc_index;
 }
 
-bool Node::increment_misc() {
+bool Node::increment_misc()
+{
        return (misc_index < misc_max) && ((++misc_index) < misc_max);
 }
 
@@ -208,7 +216,8 @@ 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(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) {
@@ -385,7 +394,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 +416,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 +431,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())) {
@@ -495,8 +507,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 +538,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;
@@ -563,7 +576,7 @@ void NodeStack::pop_restofstack(int numAhead)
 
 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 +597,5 @@ Node * NodeStack::get_next() const
 
 void NodeStack::reset_execution()
 {
-       head_idx = 0;
+       head_idx = -1;
 }