Clear headers

diff --git a/funcnode.cc b/funcnode.cc
index 8cd81423f710e9fa222ce3892ab2f91808cbb8a9..af268aad0d0cf95c3fbca6d8b32f134dc6f2af1a 100644 (file)
--- a/funcnode.cc
+++ b/funcnode.cc
@@ -1,5 +1,8 @@
+#include "action.h"

 #include "history.h"
 #include "funcnode.h"
 #include "history.h"
 #include "funcnode.h"

+#include "funcinst.h"
+#include "predicate.h"

 #include "concretepredicate.h"
 
 FuncNode::FuncNode(ModelHistory * history) :
 #include "concretepredicate.h"
 
 FuncNode::FuncNode(ModelHistory * history) :

diff --git a/funcnode.h b/funcnode.h
index 5773d79d846d79e09df531cf238cc5295ad7de28..14b5806a0aeba7b206beb1eb91697a0c58398207 100644 (file)
--- a/funcnode.h
+++ b/funcnode.h
@@ -1,12 +1,9 @@
 #ifndef __FUNCNODE_H__
 #define __FUNCNODE_H__
 
 #ifndef __FUNCNODE_H__
 #define __FUNCNODE_H__
 

-#include "action.h"
-#include "funcinst.h"
-#include "hashtable.h"

 #include "hashset.h"
 #include "hashset.h"

-#include "predicate.h"
-#include "history.h"
+#include "classlist.h"
+#include "threads-model.h"

 
 typedef ModelList<FuncInst *> func_inst_list_mt;
 
 
 typedef ModelList<FuncInst *> func_inst_list_mt;
 

diff --git a/history.cc b/history.cc
index 568cecb520ee49f7a42249b2191a9fc924104a17..4b03e7ff4b23a1644c62477f10749aa2bccc5c29 100644 (file)
--- a/history.cc
+++ b/history.cc
@@ -2,6 +2,7 @@
 #include "history.h"
 #include "action.h"
 #include "funcnode.h"
 #include "history.h"
 #include "action.h"
 #include "funcnode.h"

+#include "funcinst.h"

 #include "common.h"
 
 #include "model.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 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");
 void ModelHistory::dump_func_node_graph()
 {
        model_print("digraph func_node_graph {\n");

diff --git a/history.h b/history.h
index e85aa81a18ce4e4d4c6979ce2291c154c624726d..51f26304454612bdbca073567e5700d6b2f2ddf4 100644 (file)
--- a/history.h
+++ b/history.h
@@ -3,8 +3,8 @@
 
 #include "stl-model.h"
 #include "common.h"
 
 #include "stl-model.h"
 #include "common.h"

+#include "classlist.h"

 #include "hashtable.h"
 #include "hashtable.h"

-#include "hashset.h"

 #include "threads-model.h"
 
 class ModelHistory {
 #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;
 
        /* 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__ */
 };
 
 #endif /* __HISTORY_H__ */

diff --git a/newfuzzer.cc b/newfuzzer.cc
index eefd553ec565ea2c70553cc260ce145c2b08c861..d58142178f3eb3b830cc7529f71bd9ffe045aa43 100644 (file)
--- a/newfuzzer.cc
+++ b/newfuzzer.cc
@@ -1,13 +1,16 @@
 #include "newfuzzer.h"
 #include "threads-model.h"
 #include "newfuzzer.h"
 #include "threads-model.h"

-#include "model.h"

 #include "action.h"
 #include "action.h"

-#include "execution.h"

 #include "history.h"
 #include "funcnode.h"
 #include "history.h"
 #include "funcnode.h"

-#include "schedule.h"
+#include "funcinst.h"
+#include "predicate.h"

 #include "concretepredicate.h"
 
 #include "concretepredicate.h"
 

+#include "model.h"
+#include "schedule.h"
+#include "execution.h"
+

 NewFuzzer::NewFuzzer() :
        thrd_last_read_act(),
        thrd_curr_pred(),
 NewFuzzer::NewFuzzer() :
        thrd_last_read_act(),
        thrd_curr_pred(),

diff --git a/predicate.cc b/predicate.cc
index 94eedfd52253382a46e659488346bd596fa397dd..fd9e78fa39cf158d42b0d92490718c767422f52c 100644 (file)
--- a/predicate.cc
+++ b/predicate.cc
@@ -1,3 +1,4 @@
+#include "funcinst.h"

 #include "predicate.h"
 #include "concretepredicate.h"
 
 #include "predicate.h"
 #include "concretepredicate.h"
 

diff --git a/predicate.h b/predicate.h
index 1600cc8a9f5f7e26d628ef17b155e775a40b657a..4c26a9ddb8bace0986dbb54abda505d8090b3969 100644 (file)
--- a/predicate.h
+++ b/predicate.h
@@ -1,7 +1,6 @@
 #ifndef __PREDICATE_H__
 #define __PREDICATE_H__
 
 #ifndef __PREDICATE_H__
 #define __PREDICATE_H__
 

-#include "funcinst.h"

 #include "hashset.h"
 #include "predicatetypes.h"
 #include "classlist.h"
 #include "hashset.h"
 #include "predicatetypes.h"
 #include "classlist.h"