X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;ds=sidebyside;f=predicate.cc;h=f6454dbce37d3efe8b62dd920429a230d1e32070;hb=197a9a14e1fb32246a70e0830eaa14353fa09052;hp=714ebbbbb762748ed50c0ba9a1feba753dd90e6c;hpb=064db08aed92a31adbf00497f4dc4608f5b99857;p=c11tester.git

diff --git a/predicate.cc b/predicate.cc
index 714ebbbb..f6454dbc 100644
--- a/predicate.cc
+++ b/predicate.cc
@@ -7,9 +7,11 @@ 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),
-	failure_count(0),
-	sleep_score(0),
+	store_visible_count(0),
+	total_checking_count(0),
 	pred_expressions(16),
 	children(),
 	parent(NULL),
@@ -27,7 +29,7 @@ Predicate::~Predicate()
 
 unsigned int pred_expr_hash(struct pred_expr * expr)
 {
-        return (unsigned int)((uintptr_t)expr);
+	return (unsigned int)((uintptr_t)expr);
 }
 
 bool pred_expr_equal(struct pred_expr * p1, struct pred_expr * p2)
@@ -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,6 +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;
+}
+
+/* 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::follow_write_child(FuncInst * inst)
+{
+	ASSERT(inst->get_type() == ATOMIC_WRITE);
+
+	for (uint i = 0;i < children.size();i++) {
+		Predicate * child = children[i];
+		if (child->get_func_inst() == inst)
+			return child;
+	}
+
+	return NULL;
 }
 
 /* Evaluate predicate expressions against the given inst_act_map */
@@ -76,57 +109,32 @@ ConcretePredicate * Predicate::evaluate(inst_act_map_t * inst_act_map, thread_id
 		uint64_t value = 0;
 
 		switch(ptr->token) {
-			case NOPREDICATE:
-				break;
-			case EQUALITY:
-				FuncInst * to_be_compared;
-				ModelAction * last_act;
-
-				to_be_compared = ptr->func_inst;
-				last_act = inst_act_map->get(to_be_compared);
-				value = last_act->get_reads_from_value();
-				break;
-			case NULLITY:
-				break;
-			default:
-				break;
+		case NOPREDICATE:
+			break;
+		case EQUALITY:
+			FuncInst * to_be_compared;
+			ModelAction * last_act;
+
+			to_be_compared = ptr->func_inst;
+			last_act = inst_act_map->get(to_be_compared);
+			value = last_act->get_reads_from_value();
+			break;
+		case NULLITY:
+			break;
+		default:
+			break;
 		}
 
 		concrete->add_expression(ptr->token, value, ptr->value);
 	}
 
+	delete it;
 	return concrete;
 }
 
-void Predicate::incr_expl_count()
-{
-	exploration_count++;
-}
-
-void Predicate::incr_fail_count()
-{
-	failure_count++;
-}
-
-void Predicate::incr_sleep_score(uint32_t amount)
-{
-	if (sleep_score + amount > 100)
-		sleep_score = 100;
-	else
-		sleep_score += amount;
-}
-
-void Predicate::decr_sleep_score(uint32_t amount)
-{
-	if (sleep_score > amount)
-		sleep_score -= amount;
-	else
-		sleep_score = 0;
-}
-
 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;
@@ -137,42 +145,48 @@ void Predicate::print_predicate()
 		return;
 	}
 
-	func_inst->print();
+	model_print("depth: %u; weight: %g\n", depth, weight);
 
-	PredExprSetIter * it = pred_expressions.iterator();
+	func_inst->print();
 
 	if (pred_expressions.getSize() == 0)
 		model_print("predicate unset\n");
 
+	PredExprSetIter * it = pred_expressions.iterator();
 	while (it->hasNext()) {
 		struct pred_expr * expr = it->next();
 		FuncInst * inst = expr->func_inst;
 		switch (expr->token) {
-			case NOPREDICATE:
-				break;
-			case EQUALITY:
-				model_print("predicate token: equality, position: %s, value: %d\n", inst->get_position(), expr->value);
-				break;
-			case NULLITY:
-				model_print("predicate token: nullity, value: %d\n", expr->value);
-				break;
-			default:
-				model_print("unknown predicate token\n");
-				break;
+		case NOPREDICATE:
+			break;
+		case EQUALITY:
+			model_print("predicate token: equality, position: %s, value: %d\n", inst->get_position(), expr->value);
+			break;
+		case NULLITY:
+			model_print("predicate token: nullity, value: %d\n", expr->value);
+			break;
+		default:
+			model_print("unknown predicate token\n");
+			break;
 		}
 	}
 
 	if (does_write) {
 		model_print("Does write\n");
 	}
-	model_print("Count: %d, failed count: %d\n", exploration_count, failure_count);
+
+	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, failure count: %d", exploration_count, failure_count);
 	model_print("\"];\n");
+
+	delete it;
 }
 
 void Predicate::print_pred_subtree()
 {
 	print_predicate();
-	for (uint i = 0; i < children.size(); i++) {
+	for (uint i = 0;i < children.size();i++) {
 		Predicate * child = children[i];
 		child->print_pred_subtree();
 		model_print("\"%p\" -> \"%p\"\n", this, child);
@@ -187,4 +201,6 @@ void Predicate::print_pred_subtree()
 	if (exit) {
 		model_print("\"%p\" -> \"%p\"[style=dashed, color=red]\n", this, exit);
 	}
+
+	delete it;
 }