add thread choosing in switch func

[c11tester.git] / funcnode.h

diff --git a/funcnode.h b/funcnode.h
index b3e80741d84c06bf946a0db6a24a4b6b664f3223..a0eb6233988c1d082de9e88a734ee084772209c4 100644 (file)
--- a/funcnode.h
+++ b/funcnode.h
@@ -36,7 +36,7 @@ public:
        void update_tree(action_list_t * act_list);
        void update_inst_tree(func_inst_list_t * inst_list);
        void update_predicate_tree(action_list_t * act_list);
-       bool follow_branch(Predicate ** curr_pred, FuncInst * next_inst, ModelAction * next_act, SnapVector<Predicate *> * unset_predicates);
+       bool follow_branch(Predicate ** curr_pred, FuncInst * next_inst, ModelAction * next_act, Predicate ** unset_predicate);
 
        void incr_exit_count() { exit_count++; }
        uint32_t get_exit_count() { return exit_count; }
@@ -60,6 +60,8 @@ public:
        ModelList<FuncNode *> * get_out_edges() { return &out_edges; }
        int compute_distance(FuncNode * target, int max_step = MAX_DIST);
 
+       void add_failed_predicate(Predicate * pred);
+
        void print_predicate_tree();
 
        MEMALLOC
@@ -118,7 +120,11 @@ private:
 
        /* Run-time position in the predicate tree for each thread */
        ModelVector<Predicate *> predicate_tree_position;
+
        PredSet predicate_leaves;
+       ModelVector<Predicate *> leaves_tmp_storage;
+       ModelVector<Predicate *> weight_debug_vec;
+       PredSet failed_predicates;
 
        /* Store the relation between this FuncNode and other FuncNodes */
        HashTable<FuncNode *, edge_type_t, uintptr_t, 0, model_malloc, model_calloc, model_free> edge_table;