X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=execution.cc;h=9ef071209cbefc9020b662a3ded0d8409b958bf1;hb=HEAD;hp=d2efaba7a95dd522c96ba712eb4c761e7e36de60;hpb=ad105d2fb3c5f352ac6b7da0e1e910e94692398d;p=c11tester.git

diff --git a/execution.cc b/execution.cc
index d2efaba7..9ef07120 100644
--- a/execution.cc
+++ b/execution.cc
@@ -14,9 +14,7 @@
 #include "datarace.h"
 #include "threads-model.h"
 #include "bugmessage.h"
-#include "history.h"
 #include "fuzzer.h"
-#include "newfuzzer.h"
 
 #ifdef COLLECT_STAT
 static unsigned int atomic_load_count = 0;
@@ -79,11 +77,7 @@ ModelExecution::ModelExecution(ModelChecker *m, Scheduler *scheduler) :
 	thrd_last_fence_release(),
 	priv(new struct model_snapshot_members ()),
 	mo_graph(new CycleGraph()),
-#ifdef NEWFUZZER
-	fuzzer(new NewFuzzer()),
-#else
 	fuzzer(new Fuzzer()),
-#endif
 	isfinished(false)
 {
 	/* Initialize a model-checker thread, for special ModelActions */
@@ -384,9 +378,6 @@ ModelAction * ModelExecution::convertNonAtomicStore(void * location) {
 	add_normal_write_to_lists(act);
 	add_write_to_lists(act);
 	w_modification_order(act);
-#ifdef NEWFUZZER
-	model->get_history()->process_action(act, act->get_tid());
-#endif
 	return act;
 }
 
@@ -1750,9 +1741,6 @@ Thread * ModelExecution::take_step(ModelAction *curr)
 	ASSERT(curr);
 
 	/* Process this action in ModelHistory for records */
-#ifdef NEWFUZZER
-	model->get_history()->process_action( curr, curr->get_tid() );
-#endif
 	if (curr_thrd->is_blocked() || curr_thrd->is_complete())
 		scheduler->remove_thread(curr_thrd);