Clear headers
authorweiyu <weiyuluo1232@gmail.com>
Mon, 30 Sep 2019 18:14:07 +0000 (11:14 -0700)
committerweiyu <weiyuluo1232@gmail.com>
Mon, 30 Sep 2019 18:14:07 +0000 (11:14 -0700)
funcnode.cc
funcnode.h
history.cc
history.h
newfuzzer.cc
predicate.cc
predicate.h

index 8cd8142..af268aa 100644 (file)
@@ -1,5 +1,8 @@
+#include "action.h"
 #include "history.h"
 #include "funcnode.h"
+#include "funcinst.h"
+#include "predicate.h"
 #include "concretepredicate.h"
 
 FuncNode::FuncNode(ModelHistory * history) :
index 5773d79..14b5806 100644 (file)
@@ -1,12 +1,9 @@
 #ifndef __FUNCNODE_H__
 #define __FUNCNODE_H__
 
-#include "action.h"
-#include "funcinst.h"
-#include "hashtable.h"
 #include "hashset.h"
-#include "predicate.h"
-#include "history.h"
+#include "classlist.h"
+#include "threads-model.h"
 
 typedef ModelList<FuncInst *> func_inst_list_mt;
 
index 568cecb..4b03e7f 100644 (file)
@@ -2,6 +2,7 @@
 #include "history.h"
 #include "action.h"
 #include "funcnode.h"
+#include "funcinst.h"
 #include "common.h"
 
 #include "model.h"
@@ -62,7 +63,7 @@ void ModelHistory::enter_function(const uint32_t func_id, thread_id_t tid)
        /* Add edges between FuncNodes */
        if (last_entered_func_id != 0) {
                FuncNode * last_func_node = func_nodes[last_entered_func_id];
-               add_edges_between(last_func_node, func_node);
+               last_func_node->add_out_edge(func_node);
        }
 }
 
@@ -246,12 +247,6 @@ void ModelHistory::set_new_exec_flag()
        }
 }
 
-/* Add edges between FuncNodes */
-void ModelHistory::add_edges_between(FuncNode * prev_node, FuncNode * next_node)
-{
-       prev_node->add_out_edge(next_node);
-}
-
 void ModelHistory::dump_func_node_graph()
 {
        model_print("digraph func_node_graph {\n");
index e85aa81..51f2630 100644 (file)
--- a/history.h
+++ b/history.h
@@ -3,8 +3,8 @@
 
 #include "stl-model.h"
 #include "common.h"
+#include "classlist.h"
 #include "hashtable.h"
-#include "hashset.h"
 #include "threads-model.h"
 
 class ModelHistory {
@@ -59,7 +59,6 @@ private:
 
        /* Keeps track of the last function entered by each thread */
        SnapVector<uint32_t> thrd_last_entered_func;
-       void add_edges_between(FuncNode * prev_node, FuncNode * next_node);
 };
 
 #endif /* __HISTORY_H__ */
index eefd553..d581421 100644 (file)
@@ -1,13 +1,16 @@
 #include "newfuzzer.h"
 #include "threads-model.h"
-#include "model.h"
 #include "action.h"
-#include "execution.h"
 #include "history.h"
 #include "funcnode.h"
-#include "schedule.h"
+#include "funcinst.h"
+#include "predicate.h"
 #include "concretepredicate.h"
 
+#include "model.h"
+#include "schedule.h"
+#include "execution.h"
+
 NewFuzzer::NewFuzzer() :
        thrd_last_read_act(),
        thrd_curr_pred(),
index 94eedfd..fd9e78f 100644 (file)
@@ -1,3 +1,4 @@
+#include "funcinst.h"
 #include "predicate.h"
 #include "concretepredicate.h"
 
index 1600cc8..4c26a9d 100644 (file)
@@ -1,7 +1,6 @@
 #ifndef __PREDICATE_H__
 #define __PREDICATE_H__
 
-#include "funcinst.h"
 #include "hashset.h"
 #include "predicatetypes.h"
 #include "classlist.h"