-
-
Notifications
You must be signed in to change notification settings - Fork 330
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Enhanced TuiMonitor display to include Current Testcase Index and use… #2810
Open
devratapuri
wants to merge
1
commit into
AFLplusplus:main
Choose a base branch
from
devratapuri:feature/tui-monitor-enhancement
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+37
−8
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,8 @@ | ||
//! Stage to compute and report AFL++ stats | ||
use crate::events::Event; | ||
use crate::monitors::UserStats; | ||
use crate::monitors::{AggregatorOps, UserStatsValue}; | ||
use crate::state::UsesState; | ||
use alloc::{string::String, vec::Vec}; | ||
use core::{marker::PhantomData, time::Duration}; | ||
use std::{ | ||
|
@@ -238,7 +242,7 @@ pub struct AFLPlotData<'a> { | |
impl<C, E, EM, O, S, Z> Stage<E, EM, S, Z> for AflStatsStage<C, E, EM, O, S, Z> | ||
where | ||
E: HasObservers, | ||
EM: EventFirer, | ||
EM: EventFirer + UsesState<State = S>, | ||
Z: HasScheduler<<S::Corpus as Corpus>::Input, S>, | ||
S: HasImported | ||
+ HasCorpus | ||
|
@@ -267,7 +271,24 @@ where | |
"state is not currently processing a corpus index", | ||
)); | ||
}; | ||
// Clone or copy the required data from `state` | ||
let corpus_idx_value = corpus_idx.0; // Extract `usize` value from `CorpusId` | ||
|
||
// Fire the UpdateUserStats event with the corpus index | ||
_manager.fire( | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This should be optional (i.e., something you set in the builder), it may lead to a lot of events so slow down the fuzzer There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ok thanks will look into this |
||
state, | ||
Event::UpdateUserStats { | ||
name: Cow::Borrowed("Current Testcase Index"), | ||
value: UserStats::new( | ||
UserStatsValue::Number(corpus_idx_value as u64), | ||
AggregatorOps::Sum, | ||
), | ||
phantom: PhantomData, | ||
}, | ||
)?; | ||
|
||
let testcase = state.corpus().get(corpus_idx)?.borrow(); | ||
|
||
// NOTE: scheduled_count represents the amount of fuzz runs a | ||
// testcase has had. Since this stage is kept at the very end of stage list, | ||
// the entry would have been fuzzed already (and should contain IsFavoredMetadata) but would have a scheduled count of zero | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No need to show anything if it's not available.
Also, this only ends up in the log, not in the TUI, right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, this code update ensures that the "Testcase Index" information only ends up in the log, not in the TUI. ok will remove else
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think user stats already end up in the log (not 100% sure though)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(and really, it'd be nice to have this in the UI for the individual fuzzer, that's the idea of the tui, but we can do that in another PR)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i can try in this PR to add this in the UI for the individual fuzzer