Complete the transfer of deletions of some actions

[c11tester.git] / predicate.cc

diff --git a/predicate.cc b/predicate.cc
index 7fec1a4e9b108326091ec5892aa107425f7c0d0e..22fb0c7e8f8172d8cbf4963970c4edd7b5d85d3c 100644 (file)
--- a/predicate.cc
+++ b/predicate.cc
@@ -7,6 +7,8 @@ Predicate::Predicate(FuncInst * func_inst, bool is_entry, bool is_exit) :
        entry_predicate(is_entry),
        exit_predicate(is_exit),
        does_write(false),
+       depth(0),
+       weight(0),
        exploration_count(0),
        store_visible_count(0),
        total_checking_count(0),
@@ -53,6 +55,17 @@ void Predicate::add_child(Predicate * child)
        children.push_back(child);
 }
 
+void Predicate::set_parent(Predicate * parent_pred)
+{
+       parent = parent_pred;
+       depth = parent_pred->get_depth() + 1;
+}
+
+void Predicate::set_exit(Predicate * exit_pred)
+{
+       exit = exit_pred;
+}
+
 void Predicate::copy_predicate_expr(Predicate * other)
 {
        PredExprSet * other_pred_expressions = other->get_pred_expressions();
@@ -63,24 +76,27 @@ void Predicate::copy_predicate_expr(Predicate * other)
                struct pred_expr * copy = new pred_expr(ptr->token, ptr->func_inst, ptr->value);
                pred_expressions.add(copy);
        }
+
+       delete it;
 }
 
-/* Return the single child branch of this predicate.
- * Return NULL if this predicate has no children.
+/* Follow the child if any child whose FuncInst matches with inst
+ *
+ * @param inst must be an ATOMIC_WRITE FuncInst
+ * @return NULL if no such child is found.
  */
-Predicate * Predicate::get_single_child(FuncInst * inst)
+Predicate * Predicate::follow_write_child(FuncInst * inst)
 {
-       int size = children.size();
-       if (size == 0)
-               return NULL;
+       action_type type = inst->get_type();
+       ASSERT(type == ATOMIC_WRITE || type == ATOMIC_INIT);
 
-       /* Should only have one child */
-       ASSERT(size == 1);
-       Predicate * child = children[0];
-
-       ASSERT(child->get_func_inst() == inst);
+       for (uint i = 0;i < children.size();i++) {
+               Predicate * child = children[i];
+               if (child->get_func_inst() == inst)
+                       return child;
+       }
 
-       return child;
+       return NULL;
 }
 
 /* Evaluate predicate expressions against the given inst_act_map */
@@ -113,12 +129,13 @@ ConcretePredicate * Predicate::evaluate(inst_act_map_t * inst_act_map, thread_id
                concrete->add_expression(ptr->token, value, ptr->value);
        }
 
+       delete it;
        return concrete;
 }
 
 void Predicate::print_predicate()
 {
-       model_print("\"%p\" [shape=box, label=\"\n", this);
+       model_print("\"%p\" [shape=box, label=\"", this);
        if (entry_predicate) {
                model_print("entry node\"];\n");
                return;
@@ -129,6 +146,8 @@ void Predicate::print_predicate()
                return;
        }
 
+       model_print("depth: %u; weight: %g\n", depth, weight);
+
        func_inst->print();
 
        if (pred_expressions.getSize() == 0)
@@ -159,8 +178,10 @@ void Predicate::print_predicate()
 
        double prob = (double) store_visible_count / total_checking_count;
        model_print("Total checks: %d, visible count: %d; prob: %f\n", total_checking_count, store_visible_count, prob);
-       model_print("Exploration count: %d", exploration_count);
+       model_print("Exploration count: %d, failure count: %d", exploration_count, failure_count);
        model_print("\"];\n");
+
+       delete it;
 }
 
 void Predicate::print_pred_subtree()
@@ -181,4 +202,6 @@ void Predicate::print_pred_subtree()
        if (exit) {
                model_print("\"%p\" -> \"%p\"[style=dashed, color=red]\n", this, exit);
        }
+
+       delete it;
 }