Change initialize a bit

[c11tester.git] / predicate.cc

diff --git a/predicate.cc b/predicate.cc
index eb979f8868a9de8097ca5cbb6c4be24a0bbaa2f8..9b8060aa777b51554e1d841d9841672cb6b2593d 100644 (file)
--- a/predicate.cc
+++ b/predicate.cc
@@ -8,7 +8,7 @@ Predicate::Predicate(FuncInst * func_inst, bool is_entry, bool is_exit) :
        exit_predicate(is_exit),
        does_write(false),
        depth(0),
-       weight(0),
+       weight(100),
        exploration_count(0),
        store_visible_count(0),
        total_checking_count(0),
@@ -64,17 +64,6 @@ void Predicate::set_parent(Predicate * parent_pred)
 void Predicate::set_exit(Predicate * exit_pred)
 {
        exit = exit_pred;
-       exit_pred->add_pre_exit_predicate(this);
-}
-
-void Predicate::alloc_pre_exit_predicates()
-{
-       pre_exit_predicates = new ModelVector<Predicate *>();
-}
-
-void Predicate::add_pre_exit_predicate(Predicate * pred)
-{
-       pre_exit_predicates->push_back(pred);
 }
 
 void Predicate::copy_predicate_expr(Predicate * other)
@@ -87,57 +76,46 @@ 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);
        }
-}
-
-/* Return the single child branch of this predicate.
- * Return NULL if this predicate has no children.
- */
-Predicate * Predicate::get_single_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(child->get_func_inst() == inst);
-
-       return child;
+       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()
@@ -185,8 +163,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()
@@ -207,4 +187,6 @@ void Predicate::print_pred_subtree()
        if (exit) {
                model_print("\"%p\" -> \"%p\"[style=dashed, color=red]\n", this, exit);
        }
+
+       delete it;
 }