added mgr_id to eventmanager (#196)
This commit is contained in:
parent
5a4e5b0a93
commit
4cafa8c253
@ -25,7 +25,10 @@ use crate::{
|
|||||||
llmp::{self, Flags, LlmpClientDescription, LlmpSender, Tag},
|
llmp::{self, Flags, LlmpClientDescription, LlmpSender, Tag},
|
||||||
shmem::ShMemProvider,
|
shmem::ShMemProvider,
|
||||||
},
|
},
|
||||||
events::{BrokerEventResult, Event, EventFirer, EventManager, EventProcessor, EventRestarter},
|
events::{
|
||||||
|
BrokerEventResult, Event, EventFirer, EventManager, EventManagerId, EventProcessor,
|
||||||
|
EventRestarter,
|
||||||
|
},
|
||||||
executors::{Executor, HasObservers},
|
executors::{Executor, HasObservers},
|
||||||
fuzzer::{EvaluatorObservers, ExecutionProcessor},
|
fuzzer::{EvaluatorObservers, ExecutionProcessor},
|
||||||
inputs::Input,
|
inputs::Input,
|
||||||
@ -502,6 +505,12 @@ where
|
|||||||
OT: ObserversTuple<I, S>,
|
OT: ObserversTuple<I, S>,
|
||||||
Z: ExecutionProcessor<I, OT, S> + EvaluatorObservers<I, OT, S>, //CE: CustomEvent<I>,
|
Z: ExecutionProcessor<I, OT, S> + EvaluatorObservers<I, OT, S>, //CE: CustomEvent<I>,
|
||||||
{
|
{
|
||||||
|
/// Gets the id assigned to this sender.
|
||||||
|
fn mgr_id(&self) -> EventManagerId {
|
||||||
|
EventManagerId {
|
||||||
|
id: self.llmp.sender.id as usize,
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Serialize the current state and corpus during an executiont to bytes.
|
/// Serialize the current state and corpus during an executiont to bytes.
|
||||||
|
@ -13,6 +13,20 @@ use crate::{
|
|||||||
executors::ExitKind, inputs::Input, observers::ObserversTuple, stats::UserStats, Error,
|
executors::ExitKind, inputs::Input, observers::ObserversTuple, stats::UserStats, Error,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/// A per-fuzzer unique ID, usually starting with `0` and increasing
|
||||||
|
/// by `1` in multiprocessed `EventManager`s, such as [`self::llmp::LlmpEventManager`].
|
||||||
|
#[derive(Clone, Copy, PartialEq, Eq)]
|
||||||
|
pub struct EventManagerId {
|
||||||
|
/// The id
|
||||||
|
pub id: usize,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for EventManagerId {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self { id: 0 }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(feature = "introspection")]
|
#[cfg(feature = "introspection")]
|
||||||
use crate::stats::ClientPerfStats;
|
use crate::stats::ClientPerfStats;
|
||||||
#[cfg(feature = "introspection")]
|
#[cfg(feature = "introspection")]
|
||||||
@ -240,12 +254,18 @@ pub trait EventProcessor<E, I, S, Z> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// [`EventManager`] is the main communications hub.
|
/// [`EventManager`] is the main communications hub.
|
||||||
/// For the "normal" multi-processed mode, you may want to look into `RestartingEventManager`
|
/// For the "normal" multi-processed mode, you may want to look into [`RestartingEventManager`]
|
||||||
pub trait EventManager<E, I, S, Z>:
|
pub trait EventManager<E, I, S, Z>:
|
||||||
EventFirer<I, S> + EventProcessor<E, I, S, Z> + EventRestarter<S>
|
EventFirer<I, S> + EventProcessor<E, I, S, Z> + EventRestarter<S>
|
||||||
where
|
where
|
||||||
I: Input,
|
I: Input,
|
||||||
{
|
{
|
||||||
|
/// The id of this `0` for
|
||||||
|
fn mgr_id(&self) -> EventManagerId {
|
||||||
|
EventManagerId {
|
||||||
|
..EventManagerId::default()
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// An eventmgr for tests, and as placeholder if you really don't need an event manager.
|
/// An eventmgr for tests, and as placeholder if you really don't need an event manager.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user