From 0d5c6219d82852f5c95c3d72a7bd561cb0347475 Mon Sep 17 00:00:00 2001 From: "Dongjia \"toka\" Zhang" Date: Wed, 10 Apr 2024 16:13:03 +0200 Subject: [PATCH] Dedup CentralizedEventManager's serialize_observers() (#2034) * why * clp --- libafl/src/events/centralized.rs | 44 -------------------------------- 1 file changed, 44 deletions(-) diff --git a/libafl/src/events/centralized.rs b/libafl/src/events/centralized.rs index 42feafcee1..48fa9e9aa7 100644 --- a/libafl/src/events/centralized.rs +++ b/libafl/src/events/centralized.rs @@ -10,8 +10,6 @@ use alloc::{boxed::Box, string::String, vec::Vec}; use core::{marker::PhantomData, num::NonZeroUsize, time::Duration}; -#[cfg(feature = "adaptive_serialization")] -use libafl_bolts::current_time; #[cfg(feature = "llmp_compression")] use libafl_bolts::{ compress::GzipCompressor, @@ -332,7 +330,6 @@ where self.inner.log(state, severity_level, message) } - #[cfg(not(feature = "adaptive_serialization"))] fn serialize_observers(&mut self, observers: &OT) -> Result>, Error> where OT: ObserversTuple + Serialize, @@ -340,47 +337,6 @@ where self.inner.serialize_observers(observers) } - #[cfg(feature = "adaptive_serialization")] - fn serialize_observers(&mut self, observers: &OT) -> Result>, Error> - where - OT: ObserversTuple + Serialize, - { - const SERIALIZE_TIME_FACTOR: u32 = 4; - const SERIALIZE_PERCENTAGE_TRESHOLD: usize = 80; - - let exec_time = observers - .match_name::("time") - .map(|o| o.last_runtime().unwrap_or(Duration::ZERO)) - .unwrap(); - - let mut must_ser = (self.serialization_time() + self.deserialization_time()) - * SERIALIZE_TIME_FACTOR - < exec_time; - if must_ser { - *self.should_serialize_cnt_mut() += 1; - } - - if self.serializations_cnt() > 32 { - must_ser = (self.should_serialize_cnt() * 100 / self.serializations_cnt()) - > SERIALIZE_PERCENTAGE_TRESHOLD; - } - - if self.inner.serialization_time() == Duration::ZERO - || must_ser - || self.serializations_cnt().trailing_zeros() >= 8 - { - let start = current_time(); - let ser = postcard::to_allocvec(observers)?; - *self.inner.serialization_time_mut() = current_time() - start; - - *self.serializations_cnt_mut() += 1; - Ok(Some(ser)) - } else { - *self.serializations_cnt_mut() += 1; - Ok(None) - } - } - fn configuration(&self) -> EventConfig { self.inner.configuration() }