ci

Author: tokatoka

libafl/Cargo.toml

@@ -17,7 +17,7 @@ all-features = true
 rustc-args = ["--cfg", "docsrs"]
 
 [features]
-default = ["std", "derive", "llmp_compression", "llmp_small_maps", "llmp_broker_timeouts", "rand_trait", "fork", "prelude", "gzip", "regex", "serdeany_autoreg", "tui_monitor", "libafl_bolts/xxh3"]
+default = ["nautilus", "concolic_mutation", "std", "derive", "llmp_compression", "llmp_small_maps", "llmp_broker_timeouts", "rand_trait", "fork", "prelude", "gzip", "regex", "serdeany_autoreg", "tui_monitor", "libafl_bolts/xxh3"]
 document-features = ["dep:document-features"]
 
 #! # Feature Flags

libafl/src/feedbacks/nautilus.rs

@@ -8,6 +8,9 @@ use libafl_bolts::Named;
 use serde::{Deserialize, Serialize};
 use serde_json;
 
+#[cfg(feature = "introspection")]
+use crate::state::HasClientPerfMonitor;
+
 use crate::{
     corpus::{Corpus, Testcase},
     events::EventFirer,
@@ -16,7 +19,7 @@ use crate::{
     generators::NautilusContext,
     inputs::NautilusInput,
     observers::ObserversTuple,
-    state::{HasClientPerfMonitor, HasCorpus, HasMetadata, State},
+    state::{HasCorpus, HasMetadata, State},
     Error,
 };
 
@@ -83,7 +86,6 @@ impl<'a, S> Named for NautilusFeedback<'a, S> {
 impl<'a, S> Feedback<S> for NautilusFeedback<'a, S>
 where
     S: HasMetadata
-        + HasClientPerfMonitor
         + HasCorpus<Input = NautilusInput>
         + State<Input = NautilusInput>,
 {

libafl_qemu/src/executor.rs

@@ -10,6 +10,9 @@ use libafl::{
     executors::InProcessForkExecutor,
     state::{HasLastReportTime, HasMetadata},
 };
+
+#[cfg(feature = "introspection")]
+use libafl::state::HasClientPerfMonitor;
 use libafl::{
     events::{EventFirer, EventRestarter},
     executors::{
@@ -20,7 +23,7 @@ use libafl::{
     fuzzer::HasObjective,
     inputs::UsesInput,
     observers::{ObserversTuple, UsesObservers},
-    state::{HasClientPerfMonitor, HasCorpus, HasExecutions, HasSolutions, State, UsesState},
+    state::{HasCorpus, HasExecutions, HasSolutions, State, UsesState},
     Error,
 };
 use libafl_bolts::os::unix_signals::{siginfo_t, ucontext_t, Signal};
@@ -81,7 +84,7 @@ pub unsafe fn inproc_qemu_crash_handler<E, EM, OF, Z>(
     E: Executor<EM, Z> + HasObservers,
     EM: EventFirer<State = E::State> + EventRestarter<State = E::State>,
     OF: Feedback<E::State>,
-    E::State: HasExecutions + HasSolutions + HasClientPerfMonitor + HasCorpus,
+    E::State: HasExecutions + HasSolutions + HasCorpus,
     Z: HasObjective<Objective = OF, State = E::State>,
 {
     let real_crash = if USE_LIBAFL_CRASH_HANDLER {
@@ -118,7 +121,7 @@ pub unsafe fn inproc_qemu_timeout_handler<E, EM, OF, Z>(
     E: Executor<EM, Z> + HasObservers,
     EM: EventFirer<State = E::State> + EventRestarter<State = E::State>,
     OF: Feedback<E::State>,
-    E::State: HasSolutions + HasClientPerfMonitor + HasCorpus + HasExecutions,
+    E::State: HasSolutions + HasCorpus + HasExecutions,
     Z: HasObjective<Objective = OF, State = E::State>,
 {
     if BREAK_ON_TMOUT {
@@ -148,7 +151,7 @@ where
     where
         EM: EventFirer<State = S> + EventRestarter<State = S>,
         OF: Feedback<S>,
-        S: State + HasExecutions + HasCorpus + HasSolutions + HasClientPerfMonitor,
+        S: State + HasExecutions + HasCorpus + HasSolutions,
         Z: HasObjective<Objective = OF, State = S>,
     {
         let mut inner = InProcessExecutor::new(harness_fn, observers, fuzzer, state, event_mgr)?;
@@ -322,7 +325,7 @@ where
     where
         EM: EventFirer<State = S> + EventRestarter,
         OF: Feedback<S>,
-        S: HasSolutions + HasClientPerfMonitor,
+        S: HasSolutions,
         Z: HasObjective<Objective = OF, State = S>,
     {
         assert!(!QT::HOOKS_DO_SIDE_EFFECTS, "When using QemuForkExecutor, the hooks must not do any side effect as they will happen in the child process and then discarded");
@@ -367,7 +370,7 @@ impl<'a, EM, H, OT, QT, S, Z, SP> Executor<EM, Z> for QemuForkExecutor<'a, H, OT
 where
     EM: EventManager<InProcessForkExecutor<'a, H, OT, S, SP>, Z, State = S>,
     H: FnMut(&S::Input) -> ExitKind,
-    S: State + HasClientPerfMonitor + HasMetadata + HasExecutions + HasLastReportTime,
+    S: State + HasMetadata + HasExecutions + HasLastReportTime,
     OT: ObserversTuple<S>,
     QT: QemuHelperTuple<S>,
     SP: ShMemProvider,