small changes

[c11tester.git] / predicate.cc

diff --git a/predicate.cc b/predicate.cc
index 51b216dd66e36c1605f659bff8465fcdaa90da63..9b8060aa777b51554e1d841d9841672cb6b2593d 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(100),
        exploration_count(0),
        store_visible_count(0),
        total_checking_count(0),
@@ -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,44 +76,51 @@ 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(inst_act_map_t * inst_act_map, thread_id_t tid)
+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);
-       }
-
-       return concrete;
+       /*
+          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;
@@ -111,6 +131,8 @@ void Predicate::print_predicate()
                return;
        }
 
+       model_print("depth: %u; weight: %g\n", depth, weight);
+
        func_inst->print();
 
        if (pred_expressions.getSize() == 0)
@@ -121,17 +143,17 @@ void Predicate::print_predicate()
                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;
                }
        }
 
@@ -141,14 +163,16 @@ 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()
 {
        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);
@@ -163,4 +187,6 @@ void Predicate::print_pred_subtree()
        if (exit) {
                model_print("\"%p\" -> \"%p\"[style=dashed, color=red]\n", this, exit);
        }
+
+       delete it;
 }