X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=predicate.cc;h=e87c695bedadccfd908c31aa4524c56082833142;hb=938f4f938086a967e9cd101ecca164003f33f03c;hp=7710705174860433473b7f8d7a995e198d40a212;hpb=25b12680719a51fc81d1681a280e076920dcaabc;p=c11tester.git

diff --git a/predicate.cc b/predicate.cc
index 77107051..e87c695b 100644
--- a/predicate.cc
+++ b/predicate.cc
@@ -8,6 +8,7 @@ Predicate::Predicate(FuncInst * func_inst, bool is_entry, bool is_exit) :
 	exit_predicate(is_exit),
 	does_write(false),
 	depth(0),
+	weight(0),
 	exploration_count(0),
 	store_visible_count(0),
 	total_checking_count(0),
@@ -60,6 +61,11 @@ void Predicate::set_parent(Predicate * 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();
@@ -70,24 +76,26 @@ 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;
-
-	/* Should only have one child */
-	ASSERT(size == 1);
-	Predicate * child = children[0];
+	ASSERT(inst->get_type() == ATOMIC_WRITE);
 
-	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 */
@@ -120,6 +128,7 @@ ConcretePredicate * Predicate::evaluate(inst_act_map_t * inst_act_map, thread_id
 		concrete->add_expression(ptr->token, value, ptr->value);
 	}
 
+	delete it;
 	return concrete;
 }
 
@@ -136,7 +145,7 @@ void Predicate::print_predicate()
 		return;
 	}
 
-	model_print("depth: %d\n", depth);
+	model_print("depth: %u; weight: %g\n", depth, weight);
 
 	func_inst->print();
 
@@ -168,8 +177,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()
@@ -190,4 +201,6 @@ void Predicate::print_pred_subtree()
 	if (exit) {
 		model_print("\"%p\" -> \"%p\"[style=dashed, color=red]\n", this, exit);
 	}
+
+	delete it;
 }