Merge LlmpEventManager and LlmpRestartingEventManager (#2891)

* add

* add 2

* feature

* fix nyx launcher

* a bit of doc

* addressing comments

Author: tokatoka

docs/src/message_passing/message_passing.md

@@ -72,7 +72,7 @@ So the outgoing messages flow is like this over the outgoing broadcast `Shmem`:
 [client0]        [client1]    ...    [clientN]
 ```
 
-To use `LLMP` in LibAFL, you usually want to use an `LlmpEventManager` or its restarting variant.
+To use `LLMP` in LibAFL, you usually want to use an `LlmpRestartingEventManager` or its restarting variant.
 They are the default if using LibAFL's `Launcher`.
 
 If you should want to use `LLMP` in its raw form, without any `LibAFL` abstractions, take a look at the `llmp_test` example in [./libafl/examples](https://github.com/AFLplusplus/LibAFL/blob/main/libafl_bolts/examples/llmp_test/main.rs).

docs/src/message_passing/spawn_instances.md

@@ -58,6 +58,6 @@ For more examples, you can check out `qemu_launcher` and `libfuzzer_libpng_launc
 
 ## Other ways
 
-The `LlmpEventManager` family is the easiest way to spawn instances, but for obscure targets, you may need to come up with other solutions.
+The `LlmpRestartEventManager` is the easiest way to spawn instances, but for obscure targets, you may need to come up with other solutions.
 LLMP is even, in theory, `no_std` compatible, and even completely different EventManagers can be used for message passing.
 If you are in this situation, please either read through the current implementations and/or reach out to us.

fuzzers/binary_only/fuzzbench_qemu/README.md

@@ -1,8 +1,8 @@
 # Fuzzbench Harness
 
 This folder contains an example fuzzer tailored for fuzzbench.
-It uses the best possible setting, with the exception of a SimpleRestartingEventManager instead of an LlmpEventManager - since fuzzbench is single threaded.
-Real fuzz campaigns should consider using multithreaded LlmpEventManager, see the other examples.
+It uses the best possible setting, with the exception of a SimpleRestartingEventManager instead of an LlmpRestartingEventManager - since fuzzbench is single threaded.
+Real fuzz campaigns should consider using multithreaded LlmpRestaringtEventManager, see the other examples.
 
 ## Build
 

fuzzers/binary_only/qemu_coverage/src/fuzzer.rs

@@ -288,11 +288,6 @@ pub fn fuzz() {
         .monitor(MultiMonitor::new(|s| println!("{s}")))
         .run_client(&mut run_client)
         .cores(&options.cores)
-        .stdout_file(if options.verbose {
-            None
-        } else {
-            Some("/dev/null")
-        })
         .build()
         .launch()
     {

fuzzers/binary_only/qemu_launcher/src/fuzzer.rs

@@ -10,7 +10,7 @@ use libafl::events::SimpleEventManager;
 #[cfg(not(feature = "simplemgr"))]
 use libafl::events::{EventConfig, Launcher, MonitorTypedEventManager};
 use libafl::{
-    events::{ClientDescription, LlmpEventManager, LlmpRestartingEventManager},
+    events::{ClientDescription, LlmpEventManagerBuilder},
     monitors::{tui::TuiMonitor, Monitor, MultiMonitor},
     Error,
 };
@@ -114,17 +114,17 @@ impl Fuzzer {
             // To rerun an input, instead of using a launcher, we create dummy parameters and run the client directly.
             return client.run(
                 None,
-                MonitorTypedEventManager::<_, M>::new(LlmpRestartingEventManager::new(
-                    LlmpEventManager::builder()
-                        .build_on_port(
-                            shmem_provider.clone(),
-                            broker_port,
-                            EventConfig::AlwaysUnique,
-                            None,
-                        )
-                        .unwrap(),
-                    StateRestorer::new(shmem_provider.new_shmem(0x1000).unwrap()),
-                )),
+                MonitorTypedEventManager::<_, M>::new(
+                    LlmpEventManagerBuilder::builder().build_on_port(
+                        shmem_provider.clone(),
+                        broker_port,
+                        EventConfig::AlwaysUnique,
+                        None,
+                        Some(StateRestorer::new(
+                            shmem_provider.new_shmem(0x1000).unwrap(),
+                        )),
+                    )?,
+                ),
                 ClientDescription::new(0, 0, CoreId(0)),
             );
         }

fuzzers/full_system/nyx_launcher/src/fuzzer.rs

@@ -7,8 +7,7 @@ use std::{
 use clap::Parser;
 use libafl::{
     events::{
-        ClientDescription, EventConfig, Launcher, LlmpEventManager, LlmpRestartingEventManager,
-        MonitorTypedEventManager,
+        ClientDescription, EventConfig, Launcher, LlmpEventManagerBuilder, MonitorTypedEventManager,
     },
     monitors::{tui::TuiMonitor, Monitor, MultiMonitor},
     Error,
@@ -111,17 +110,17 @@ impl Fuzzer {
             // To rerun an input, instead of using a launcher, we create dummy parameters and run the client directly.
             return client.run(
                 None,
-                MonitorTypedEventManager::<_, M>::new(LlmpRestartingEventManager::new(
-                    LlmpEventManager::builder()
-                        .build_on_port(
-                            shmem_provider.clone(),
-                            broker_port,
-                            EventConfig::AlwaysUnique,
-                            None,
-                        )
-                        .unwrap(),
-                    StateRestorer::new(shmem_provider.new_shmem(0x1000).unwrap()),
-                )),
+                MonitorTypedEventManager::<_, M>::new(
+                    LlmpEventManagerBuilder::builder().build_on_port(
+                        shmem_provider.clone(),
+                        broker_port,
+                        EventConfig::AlwaysUnique,
+                        None,
+                        Some(StateRestorer::new(
+                            shmem_provider.new_shmem(0x1000).unwrap(),
+                        )),
+                    )?,
+                ),
                 ClientDescription::new(0, 0, CoreId(0)),
             );
         }

fuzzers/inprocess/fuzzbench/README.md

@@ -1,8 +1,8 @@
 # Fuzzbench Harness
 
 This folder contains an example fuzzer tailored for fuzzbench.
-It uses the best possible setting, with the exception of a SimpleRestartingEventManager instead of an LlmpEventManager - since fuzzbench is single threaded.
-Real fuzz campaigns should consider using multithreaded LlmpEventManager, see the other examples.
+It uses the best possible setting, with the exception of a SimpleRestartingEventManager instead of an LlmpRestartEventManager - since fuzzbench is single threaded.
+Real fuzz campaigns should consider using multithreaded LlmpRestartEventManager, see the other examples.
 
 ## Build
 

fuzzers/inprocess/fuzzbench_text/README.md

@@ -1,8 +1,8 @@
 # Fuzzbench Harness (text)
 
 This folder contains an example fuzzer tailored for fuzzbench.
-It uses the best possible setting, with the exception of a SimpleRestartingEventManager instead of an LlmpEventManager - since fuzzbench is single threaded.
-Real fuzz campaigns should consider using multithreaded LlmpEventManager, see the other examples.
+It uses the best possible setting, with the exception of a SimpleRestartingEventManager instead of an LlmpRestartEventManager - since fuzzbench is single threaded.
+Real fuzz campaigns should consider using multithreaded LlmpRestartEventManager, see the other examples.
 
 This fuzzer autodetect if the passed-in tokens and the initial inputs are text or binary data, and enables Grimoire in case of text.