Enhanced TuiMonitor display to include Current Testcase Index and use…

libafl/src/monitors/tui/mod.rs

@@ -430,14 +430,14 @@ impl Monitor for TuiMonitor {
     #[expect(clippy::cast_sign_loss)]
     fn display(&mut self, event_msg: &str, sender_id: ClientId) {
         let cur_time = current_time();
-
+    
         {
             // TODO implement floating-point support for TimedStat
             let execsec = self.execs_per_sec() as u64;
             let totalexec = self.total_execs();
             let run_time = cur_time - self.start_time;
             let total_process_timing = self.process_timing();
-
+    
             let mut ctx = self.context.write().unwrap();
             ctx.total_process_timing = total_process_timing;
             ctx.corpus_size_timed.add(run_time, self.corpus_size());
@@ -452,11 +452,11 @@ impl Monitor for TuiMonitor {
             ctx.total_corpus_count = self.corpus_size();
             ctx.total_item_geometry = self.item_geometry();
         }
-
+    
         self.client_stats_insert(sender_id);
         let client = self.client_stats_mut_for(sender_id);
         let exec_sec = client.execs_per_sec_pretty(cur_time);
-
+    
         let sender = format!("#{}", sender_id.0);
         let pad = if event_msg.len() + sender.len() < 13 {
             " ".repeat(13 - event_msg.len() - sender.len())
@@ -468,13 +468,21 @@ impl Monitor for TuiMonitor {
             "[{}] corpus: {}, objectives: {}, executions: {}, exec/sec: {}",
             head, client.corpus_size, client.objective_size, client.executions, exec_sec
         );
+
+        // Display "Current Testcase Index" if available
+        if let Some(stat) = client.get_user_stats("Current Testcase Index") {
+            write!(fmt, ", Testcase Index: {}", stat.value()).unwrap();
+        } else {
+            write!(fmt, ", Testcase Index: N/A").unwrap();
+        }
+
         for (key, val) in &client.user_monitor {
             write!(fmt, ", {key}: {val}").unwrap();
         }
         for (key, val) in &self.aggregator.aggregated {
             write!(fmt, ", {key}: {val}").unwrap();
         }
-
+    
         {
             let client = &self.client_stats()[sender_id.0 as usize];
             let mut ctx = self.context.write().unwrap();
@@ -487,7 +495,7 @@ impl Monitor for TuiMonitor {
             }
             ctx.client_logs.push_back(fmt);
         }
-
+    
         #[cfg(feature = "introspection")]
         {
             // Print the client performance monitor. Skip the Client IDs that have never sent anything.
@@ -502,7 +510,7 @@ impl Monitor for TuiMonitor {
             }
         }
     }
-
+    
     fn aggregate(&mut self, name: &str) {
         self.aggregator.aggregate(name, &self.client_stats);
     }

libafl/src/stages/afl_stats.rs

@@ -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 alloc::{string::String, vec::Vec};
 use core::{marker::PhantomData, time::Duration};
 use std::{
@@ -24,9 +28,8 @@ use serde::{Deserialize, Serialize};
 use crate::feedbacks::{CRASH_FEEDBACK_NAME, TIMEOUT_FEEDBACK_NAME};
 use crate::{
     corpus::{Corpus, HasCurrentCorpusId, SchedulerTestcaseMetadata, Testcase},
-    events::{Event, EventFirer},
+    events::EventFirer,
     executors::HasObservers,
-    monitors::{AggregatorOps, UserStats, UserStatsValue},
     mutators::Tokens,
     observers::MapObserver,
     schedulers::{minimizer::IsFavoredMetadata, HasQueueCycles},
@@ -115,6 +118,7 @@ pub struct AflStatsStage<C, E, EM, I, O, S, Z> {
     /// The core we are bound to
     core_id: CoreId,
     phantom_data: PhantomData<(E, EM, I, O, S, Z)>,
+    report_current_corpus_idx: bool,
 }
 
 /// AFL++'s `fuzzer_stats`
@@ -240,7 +244,7 @@ impl<C, E, EM, I, O, S, Z> Stage<E, EM, S, Z> for AflStatsStage<C, E, EM, I, O,
 where
     C: AsRef<O> + Named,
     E: HasObservers,
-    EM: EventFirer<I, S>,
+    EM: EventFirer<I, S> ,
     Z: HasScheduler<I, S>,
     S: HasImported
         + HasCorpus<I>
@@ -268,7 +272,25 @@ 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
+        if self.report_current_corpus_idx {
+        manager.fire(
+            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
@@ -658,6 +680,7 @@ pub struct AflStatsStageBuilder<C, E, EM, I, O, S, Z> {
     version: String,
     target_mode: String,
     phantom_data: PhantomData<(E, EM, I, O, S, Z)>,
+    report_current_corpus_idx: bool,
 }
 
 impl<C, E, EM, I, O, S, Z> AflStatsStageBuilder<C, E, EM, I, O, S, Z>
@@ -682,6 +705,7 @@ where
             version: String::default(),
             target_mode: String::default(),
             phantom_data: PhantomData,
+            report_current_corpus_idx: false,
         }
     }
 
@@ -817,6 +841,7 @@ where
             dict_count: self.dict_count,
             core_id: self.core_id.unwrap_or(CoreId(0)),
             autotokens_enabled: self.uses_autotokens,
+            report_current_corpus_idx: self.report_current_corpus_idx, // Set field
             phantom_data: PhantomData,
         })
     }