From 9369eae37be72ffcf93c3f2076da33a11e5674fc Mon Sep 17 00:00:00 2001
From: Alwin Berger <alwin.berger@tu-dortmund.de>
Date: Wed, 9 Feb 2022 12:55:21 +0100
Subject: [PATCH] crate structure

---
 fuzzers/wcet_qemu_sys/src/{ => bin}/fuzzer.rs  |  4 ++--
 fuzzers/wcet_qemu_sys/src/{ => bin}/showmap.rs |  8 ++++----
 fuzzers/wcet_qemu_sys/src/lib.rs               |  5 +++++
 fuzzers/wcet_qemu_sys/src/main.rs              | 14 --------------
 4 files changed, 11 insertions(+), 20 deletions(-)
 rename fuzzers/wcet_qemu_sys/src/{ => bin}/fuzzer.rs (99%)
 rename fuzzers/wcet_qemu_sys/src/{ => bin}/showmap.rs (98%)
 create mode 100644 fuzzers/wcet_qemu_sys/src/lib.rs
 delete mode 100644 fuzzers/wcet_qemu_sys/src/main.rs

diff --git a/fuzzers/wcet_qemu_sys/src/fuzzer.rs b/fuzzers/wcet_qemu_sys/src/bin/fuzzer.rs
similarity index 99%
rename from fuzzers/wcet_qemu_sys/src/fuzzer.rs
rename to fuzzers/wcet_qemu_sys/src/bin/fuzzer.rs
index ed22a4f6dd..a71e55aa98 100644
--- a/fuzzers/wcet_qemu_sys/src/fuzzer.rs
+++ b/fuzzers/wcet_qemu_sys/src/bin/fuzzer.rs
@@ -2,7 +2,7 @@
 
 use libafl::mutators::ByteFlipMutator;
 use libafl::mutators::BitFlipMutator;
-use crate::worst::LenTimeMaximizerCorpusScheduler;
+use wcet_qemu_sys::worst::LenTimeMaximizerCorpusScheduler;
 use libafl::corpus::MinimizerCorpusScheduler;
 use hashbrown::HashMap;
 use libafl::events::SimpleEventManager;
@@ -65,7 +65,7 @@ use libafl_qemu::{
     clock::ClockFeedback,
     clock::QemuClockIncreaseFeedback
 };
-use crate::worst::{HitFeedback,HitcountsMapObserver,HitImprovingFeedback};
+use wcet_qemu_sys::worst::{HitFeedback,HitcountsMapObserver,HitImprovingFeedback};
 
 
 /// The fuzzer main
diff --git a/fuzzers/wcet_qemu_sys/src/showmap.rs b/fuzzers/wcet_qemu_sys/src/bin/showmap.rs
similarity index 98%
rename from fuzzers/wcet_qemu_sys/src/showmap.rs
rename to fuzzers/wcet_qemu_sys/src/bin/showmap.rs
index 9a21240f5d..ae692202fe 100644
--- a/fuzzers/wcet_qemu_sys/src/showmap.rs
+++ b/fuzzers/wcet_qemu_sys/src/bin/showmap.rs
@@ -1,16 +1,16 @@
 //! A singlethreaded QEMU fuzzer that can auto-restart.
 
-use crate::worst::DumpMapFeedback;
-use crate::worst::DummyFeedback;
+use wcet_qemu_sys::worst::DumpMapFeedback;
+use wcet_qemu_sys::worst::DummyFeedback;
 use libafl_qemu::QemuInstrumentationFilter;
-use crate::system_trace::QemuSystemStateHelper;
+use wcet_qemu_sys::system_trace::QemuSystemStateHelper;
 use libafl_qemu::QemuExecutor;
 use libafl::Evaluator;
 use libafl::inputs::Input;
 use libafl::corpus::InMemoryCorpus;
 use libafl::events::SimpleEventManager;
 use libafl::stats::SimpleStats;
-use crate::worst::HitcountsMapObserver;
+use wcet_qemu_sys::worst::HitcountsMapObserver;
 use clap::{App, Arg};
 use std::{
     env,
diff --git a/fuzzers/wcet_qemu_sys/src/lib.rs b/fuzzers/wcet_qemu_sys/src/lib.rs
new file mode 100644
index 0000000000..5c4c7d64f1
--- /dev/null
+++ b/fuzzers/wcet_qemu_sys/src/lib.rs
@@ -0,0 +1,5 @@
+#![feature(iter_advance_by)]
+#[cfg(target_os = "linux")]
+pub mod worst;
+pub mod freertos;
+pub mod system_trace;
diff --git a/fuzzers/wcet_qemu_sys/src/main.rs b/fuzzers/wcet_qemu_sys/src/main.rs
deleted file mode 100644
index c9c76a02db..0000000000
--- a/fuzzers/wcet_qemu_sys/src/main.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-#![feature(iter_advance_by)]
-#[cfg(target_os = "linux")]
-pub mod fuzzer;
-pub mod showmap;
-pub mod worst;
-pub mod freertos;
-pub mod system_trace;
-
-fn main() {
-    #[cfg(all(target_os = "linux", feature = "showmap"))]
-    showmap::main();
-    #[cfg(all(target_os = "linux", not(feature = "showmap")))]
-    fuzzer::main();
-}