track meta in map feedback
This commit is contained in:
Andrea Fioraldi
parent
140a303546
commit
204076bb1e
@ -82,6 +82,7 @@ where
|
||||
{
|
||||
/// Add an entry to the corpus and return its index
|
||||
fn on_add(&self, state: &mut S, idx: usize) -> Result<(), Error> {
|
||||
self.update_score(state, idx)?;
|
||||
self.base.on_add(state, idx)
|
||||
}
|
||||
|
||||
@ -103,6 +104,7 @@ where
|
||||
// TODO: IntoIter
|
||||
/// Gets the next entry
|
||||
fn next(&self, state: &mut S) -> Result<usize, Error> {
|
||||
self.cull(state)?;
|
||||
self.base.next(state)
|
||||
}
|
||||
}
|
||||
@ -118,12 +120,16 @@ where
|
||||
C: Corpus<I>,
|
||||
{
|
||||
pub fn update_score(&self, state: &mut S, idx: usize) -> Result<(), Error> {
|
||||
// Create a new top rated meta if not existing
|
||||
if state.metadata().get::<TopRatedsMetadata>().is_none() {
|
||||
state.add_metadata(TopRatedsMetadata::new());
|
||||
}
|
||||
|
||||
let mut new_favoreds = vec![];
|
||||
{
|
||||
let mut entry = state.corpus().get(idx)?.borrow_mut();
|
||||
let factor = F::compute(&mut *entry)?;
|
||||
for elem in entry.metadatas().get::<IT>().unwrap() {
|
||||
// TODO proper check for TopRatedsMetadata and create a new one if not present
|
||||
if let Some(old_idx) = state
|
||||
.metadata()
|
||||
.get::<TopRatedsMetadata>()
|
||||
|
||||
@ -2,12 +2,13 @@ use alloc::{
|
||||
string::{String, ToString},
|
||||
vec::Vec,
|
||||
};
|
||||
use core::{iter::IntoIterator, marker::PhantomData};
|
||||
use core::marker::PhantomData;
|
||||
use num::Integer;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use crate::{
|
||||
bolts::tuples::Named,
|
||||
corpus::Testcase,
|
||||
executors::ExitKind,
|
||||
feedbacks::Feedback,
|
||||
inputs::Input,
|
||||
@ -73,23 +74,7 @@ where
|
||||
}
|
||||
}
|
||||
|
||||
/// A testcase metadata holding a list of indexes of a map
|
||||
#[derive(Serialize, Deserialize)]
|
||||
pub struct IndexesMetadata {
|
||||
pub list: Vec<usize>,
|
||||
}
|
||||
|
||||
crate::impl_serdeany!(IndexesMetadata);
|
||||
|
||||
impl IntoIterator for IndexesMetadata {
|
||||
type Item = usize;
|
||||
type IntoIter = alloc::vec::IntoIter<Self::Item>;
|
||||
|
||||
fn into_iter(self) -> Self::IntoIter {
|
||||
self.list.into_iter()
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
/// The most common AFL-like feedback type
|
||||
#[derive(Serialize, Deserialize, Clone, Debug)]
|
||||
#[serde(bound = "T: serde::de::DeserializeOwned")]
|
||||
@ -203,80 +188,151 @@ where
|
||||
}
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
// TODO: TimeFeedback
|
||||
/// A testcase metadata holding a list of indexes of a map
|
||||
#[derive(Serialize, Deserialize)]
|
||||
pub struct MapIndexesMetadata {
|
||||
pub list: Vec<usize>,
|
||||
}
|
||||
|
||||
/*
|
||||
crate::impl_serdeany!(MapIndexesMetadata);
|
||||
|
||||
impl IntoIterator for MapIndexesMetadata {
|
||||
type Item = usize;
|
||||
type IntoIter = alloc::vec::IntoIter<Self::Item>;
|
||||
|
||||
fn into_iter(self) -> Self::IntoIter {
|
||||
self.list.into_iter()
|
||||
}
|
||||
}
|
||||
|
||||
impl MapIndexesMetadata {
|
||||
pub fn new(list: Vec<usize>) -> Self {
|
||||
Self { list }
|
||||
}
|
||||
}
|
||||
|
||||
/// A testcase metadata holding a list of indexes of a map
|
||||
#[derive(Serialize, Deserialize)]
|
||||
pub struct MapNoveltiesMetadata {
|
||||
novelties: Vec<usize>,
|
||||
pub list: Vec<usize>,
|
||||
}
|
||||
|
||||
impl SerdeAny for MapNoveltiesMetadata {
|
||||
fn as_any(&self) -> &dyn Any {
|
||||
self
|
||||
}
|
||||
fn as_any_mut(&mut self) -> &mut dyn Any {
|
||||
self
|
||||
crate::impl_serdeany!(MapNoveltiesMetadata);
|
||||
|
||||
impl IntoIterator for MapNoveltiesMetadata {
|
||||
type Item = usize;
|
||||
type IntoIter = alloc::vec::IntoIter<Self::Item>;
|
||||
|
||||
fn into_iter(self) -> Self::IntoIter {
|
||||
self.list.into_iter()
|
||||
}
|
||||
}
|
||||
|
||||
impl TestcaseMetadata for MapNoveltiesMetadata {
|
||||
fn name(&self) -> &'static str {
|
||||
"MapNoveltiesMetadata"
|
||||
}
|
||||
}
|
||||
impl MapNoveltiesMetadata {
|
||||
pub fn novelties(&self) -> &[usize] {
|
||||
&self.novelties
|
||||
}
|
||||
|
||||
pub fn new(novelties: Vec<usize>) -> Self {
|
||||
Self {
|
||||
novelties: novelties,
|
||||
}
|
||||
pub fn new(list: Vec<usize>) -> Self {
|
||||
Self { list }
|
||||
}
|
||||
}
|
||||
|
||||
/// The most common AFL-like feedback type that adds metadata about newly discovered entries
|
||||
pub struct MapTrackerFeedback<T, R, O>
|
||||
/// The most common AFL-like feedback type
|
||||
#[derive(Serialize, Deserialize, Clone, Debug)]
|
||||
#[serde(bound = "T: serde::de::DeserializeOwned")]
|
||||
pub struct MapFeedback<T, R, O>
|
||||
where
|
||||
T: Integer + Copy + 'static,
|
||||
T: Integer + Default + Copy + 'static + serde::Serialize + serde::de::DeserializeOwned,
|
||||
R: Reducer<T>,
|
||||
O: MapObserver<T>,
|
||||
{
|
||||
/// Contains information about untouched entries
|
||||
history_map: Vec<T>,
|
||||
/// Indexes used in the last observation
|
||||
indexes: Option<Vec<usize>>,
|
||||
/// New indexes observed in the last observation
|
||||
novelties: Option<Vec<usize>>,
|
||||
/// Name identifier of this instance
|
||||
name: &'static str,
|
||||
name: String,
|
||||
/// Phantom Data of Reducer
|
||||
phantom: PhantomData<(R, O)>,
|
||||
/// Track novel entries indexes
|
||||
novelties: Vec<usize>,
|
||||
}
|
||||
|
||||
impl<T, R, O, I> Feedback<I> for MapTrackerFeedback<T, R, O>
|
||||
impl<T, R, O, I> Feedback<I> for MapFeedback<T, R, O>
|
||||
where
|
||||
T: Integer + Copy + 'static,
|
||||
T: Integer
|
||||
+ Default
|
||||
+ Copy
|
||||
+ 'static
|
||||
+ serde::Serialize
|
||||
+ serde::de::DeserializeOwned
|
||||
+ core::fmt::Debug,
|
||||
R: Reducer<T>,
|
||||
O: MapObserver<T>,
|
||||
I: Input,
|
||||
{
|
||||
fn is_interesting(&mut self, _input: &I) -> Result<u32, Error> {
|
||||
fn is_interesting<OT: ObserversTuple>(
|
||||
&mut self,
|
||||
_input: &I,
|
||||
observers: &OT,
|
||||
_exit_kind: ExitKind,
|
||||
) -> Result<u32, Error> {
|
||||
let mut interesting = 0;
|
||||
|
||||
// TODO optimize
|
||||
let size = self.map_observer.borrow().map().len();
|
||||
let mut history_map = self.history_map.borrow_mut();
|
||||
let observer = self.map_observer.borrow();
|
||||
let observer = observers.match_name_type::<O>(&self.name).unwrap();
|
||||
let size = observer.usable_count();
|
||||
let initial = observer.initial();
|
||||
|
||||
if self.indexes.is_none() && self.novelties.is_none() {
|
||||
for i in 0..size {
|
||||
let history = history_map[i];
|
||||
let history = self.history_map[i];
|
||||
let item = observer.map()[i];
|
||||
|
||||
let reduced = R::reduce(history, item);
|
||||
if history != reduced {
|
||||
history_map[i] = reduced;
|
||||
self.history_map[i] = reduced;
|
||||
interesting += 1;
|
||||
self.novelties.push(i);
|
||||
}
|
||||
}
|
||||
} else if self.indexes.is_some() && self.novelties.is_none() {
|
||||
for i in 0..size {
|
||||
let history = self.history_map[i];
|
||||
let item = observer.map()[i];
|
||||
if item != initial {
|
||||
self.indexes.as_mut().unwrap().push(i);
|
||||
}
|
||||
|
||||
let reduced = R::reduce(history, item);
|
||||
if history != reduced {
|
||||
self.history_map[i] = reduced;
|
||||
interesting += 1;
|
||||
}
|
||||
}
|
||||
} else if self.indexes.is_none() && self.novelties.is_some() {
|
||||
for i in 0..size {
|
||||
let history = self.history_map[i];
|
||||
let item = observer.map()[i];
|
||||
|
||||
let reduced = R::reduce(history, item);
|
||||
if history != reduced {
|
||||
self.history_map[i] = reduced;
|
||||
interesting += 1;
|
||||
self.novelties.as_mut().unwrap().push(i);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for i in 0..size {
|
||||
let history = self.history_map[i];
|
||||
let item = observer.map()[i];
|
||||
if item != initial {
|
||||
self.indexes.as_mut().unwrap().push(i);
|
||||
}
|
||||
|
||||
let reduced = R::reduce(history, item);
|
||||
if history != reduced {
|
||||
self.history_map[i] = reduced;
|
||||
interesting += 1;
|
||||
self.novelties.as_mut().unwrap().push(i);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -284,57 +340,113 @@ where
|
||||
}
|
||||
|
||||
fn append_metadata(&mut self, testcase: &mut Testcase<I>) -> Result<(), Error> {
|
||||
let meta = MapNoveltiesMetadata::new(core::mem::take(&mut self.novelties));
|
||||
match self.indexes.as_mut() {
|
||||
Some(v) => {
|
||||
let meta = MapIndexesMetadata::new(core::mem::take(v));
|
||||
testcase.add_metadata(meta);
|
||||
}
|
||||
None => {}
|
||||
};
|
||||
match self.novelties.as_mut() {
|
||||
Some(v) => {
|
||||
let meta = MapNoveltiesMetadata::new(core::mem::take(v));
|
||||
testcase.add_metadata(meta);
|
||||
}
|
||||
None => {}
|
||||
};
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Discard the stored metadata in case that the testcase is not added to the corpus
|
||||
fn discard_metadata(&mut self, _input: &I) -> Result<(), Error> {
|
||||
self.novelties.clear();
|
||||
if let Some(v) = self.indexes.as_mut() {
|
||||
v.clear();
|
||||
}
|
||||
if let Some(v) = self.novelties.as_mut() {
|
||||
v.clear();
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn name(&self) -> &'static str {
|
||||
self.name
|
||||
}
|
||||
}
|
||||
|
||||
impl<T, R, O> MapTrackerFeedback<T, R, O>
|
||||
impl<T, R, O> Named for MapFeedback<T, R, O>
|
||||
where
|
||||
T: Integer + Copy + Default + 'static,
|
||||
T: Integer + Default + Copy + 'static + serde::Serialize + serde::de::DeserializeOwned,
|
||||
R: Reducer<T>,
|
||||
O: MapObserver<T>,
|
||||
{
|
||||
/// Create new MapFeedback using a map observer
|
||||
pub fn new(map_observer: Rc<RefCell<O>>, map_size: usize) -> Self {
|
||||
#[inline]
|
||||
fn name(&self) -> &str {
|
||||
self.name.as_str()
|
||||
}
|
||||
}
|
||||
|
||||
impl<T, R, O> MapFeedback<T, R, O>
|
||||
where
|
||||
T: Integer + Default + Copy + 'static + serde::Serialize + serde::de::DeserializeOwned,
|
||||
R: Reducer<T>,
|
||||
O: MapObserver<T> + Observer,
|
||||
{
|
||||
/// Create new MapFeedback
|
||||
pub fn new(name: &'static str, map_size: usize) -> Self {
|
||||
Self {
|
||||
map_observer: map_observer,
|
||||
history_map: create_history_map::<T>(map_size),
|
||||
history_map: vec![T::default(); map_size],
|
||||
phantom: PhantomData,
|
||||
novelties: vec![],
|
||||
indexes: None,
|
||||
novelties: None,
|
||||
name: name.to_string(),
|
||||
}
|
||||
}
|
||||
|
||||
/// Create new MapFeedback for the observer type.
|
||||
pub fn new_with_observer(map_observer: &O) -> Self {
|
||||
Self {
|
||||
history_map: vec![T::default(); map_observer.map().len()],
|
||||
phantom: PhantomData,
|
||||
indexes: None,
|
||||
novelties: None,
|
||||
name: map_observer.name().to_string(),
|
||||
}
|
||||
}
|
||||
|
||||
/// Create new MapFeedback specifying if it must track indexes of novelties
|
||||
pub fn new_track(name: &'static str, map_size: usize, track_indexes: bool, track_novelties: bool) -> Self {
|
||||
Self {
|
||||
history_map: vec![T::default(); map_size],
|
||||
phantom: PhantomData,
|
||||
indexes: if track_indexes { Some(vec![]) } else { None },
|
||||
novelties: if track_novelties { Some(vec![]) } else { None },
|
||||
name: name.to_string(),
|
||||
}
|
||||
}
|
||||
|
||||
/// Create new MapFeedback for the observer type if it must track indexes of novelties
|
||||
pub fn new_with_observer_track(map_observer: &O, track_indexes: bool, track_novelties: bool) -> Self {
|
||||
Self {
|
||||
history_map: vec![T::default(); map_observer.map().len()],
|
||||
phantom: PhantomData,
|
||||
indexes: if track_indexes { Some(vec![]) } else { None },
|
||||
novelties: if track_novelties { Some(vec![]) } else { None },
|
||||
name: map_observer.name().to_string(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<T, R, O> MapTrackerFeedback<T, R, O>
|
||||
impl<T, R, O> MapFeedback<T, R, O>
|
||||
where
|
||||
T: Integer + Copy + 'static,
|
||||
T: Integer + Default + Copy + 'static + serde::Serialize + serde::de::DeserializeOwned,
|
||||
R: Reducer<T>,
|
||||
O: MapObserver<T>,
|
||||
{
|
||||
/// Create new MapFeedback using a map observer, and a map.
|
||||
/// The map can be shared.
|
||||
pub fn with_history_map(
|
||||
map_observer: Rc<RefCell<O>>,
|
||||
history_map: Rc<RefCell<Vec<T>>>,
|
||||
) -> Self {
|
||||
MapTrackerFeedback {
|
||||
map_observer: map_observer,
|
||||
pub fn with_history_map(name: &'static str, history_map: Vec<T>) -> Self {
|
||||
Self {
|
||||
history_map: history_map,
|
||||
name: name.to_string(),
|
||||
indexes: None,
|
||||
novelties: None,
|
||||
phantom: PhantomData,
|
||||
novelties: vec![],
|
||||
}
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
@ -85,6 +85,15 @@ pub trait HasMetadata {
|
||||
{
|
||||
self.metadata_mut().insert(meta);
|
||||
}
|
||||
|
||||
/// Check for a metadata
|
||||
#[inline]
|
||||
fn has_metadata<M>(&self) -> bool
|
||||
where
|
||||
M: SerdeAny,
|
||||
{
|
||||
self.metadata().get::<M>().is_some()
|
||||
}
|
||||
}
|
||||
|
||||
/// Trait for elements offering a feedbacks tuple
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user