X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=predicate.cc;h=9b8060aa777b51554e1d841d9841672cb6b2593d;hp=2d7777783dac99e1f28553b416c969a0b34e4591;hb=251ac4b4bf3a9f2d3cfacc1e6618200ca1c431ac;hpb=8c52c96262bbb96bcb4d18706daf8dbd77990b1d

diff --git a/predicate.cc b/predicate.cc
index 2d777778..9b8060aa 100644
--- a/predicate.cc
+++ b/predicate.cc
@@ -1,11 +1,21 @@
+#include "funcinst.h"
 #include "predicate.h"
+#include "concretepredicate.h"
 
-Predicate::Predicate(FuncInst * func_inst, bool is_entry) :
+Predicate::Predicate(FuncInst * func_inst, bool is_entry, bool is_exit) :
 	func_inst(func_inst),
 	entry_predicate(is_entry),
+	exit_predicate(is_exit),
+	does_write(false),
+	depth(0),
+	weight(100),
+	exploration_count(0),
+	store_visible_count(0),
+	total_checking_count(0),
 	pred_expressions(16),
 	children(),
 	parent(NULL),
+	exit(NULL),
 	backedges(16)
 {}
 
@@ -19,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)
@@ -45,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();
@@ -55,47 +76,103 @@ 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;
+}
+
+/* Evaluate predicate expressions against the given inst_act_map */
+ConcretePredicate * Predicate::evaluate(thread_id_t tid)
+{
+	/*
+	   ConcretePredicate * concrete = new ConcretePredicate(tid);
+	   PredExprSetIter * it = pred_expressions.iterator();
+
+	   while (it->hasNext()) {
+	        struct pred_expr * ptr = it->next();
+	        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;
+	        }
+
+	        concrete->add_expression(ptr->token, value, ptr->value);
+	   }
+
+	   delete it;
+	   return concrete;
+	 */
+
+	return NULL;
 }
 
 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;
 	}
 
-	func_inst->print();
+	if (exit_predicate) {
+		model_print("exit node\"];\n");
+		return;
+	}
 
-	PredExprSetIter * it = pred_expressions.iterator();
+	model_print("depth: %u; weight: %g\n", depth, weight);
+
+	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");
+	}
+
+	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);
@@ -106,4 +183,10 @@ void Predicate::print_pred_subtree()
 		Predicate * backedge = it->next();
 		model_print("\"%p\" -> \"%p\"[style=dashed, color=grey]\n", this, backedge);
 	}
+
+	if (exit) {
+		model_print("\"%p\" -> \"%p\"[style=dashed, color=red]\n", this, exit);
+	}
+
+	delete it;
 }