fix: 更新后编译失败

Author: shadow3aaa

Diff for: examples/simple-analyzer/src/main.rs

@@ -19,8 +19,8 @@
 use std::{
     collections::VecDeque,
     sync::{
-        atomic::{AtomicBool, Ordering},
         Arc,
+        atomic::{AtomicBool, Ordering},
     },
     time::Duration,
 };

Diff for: frame-analyzer-ebpf/src/main.rs

@@ -20,7 +20,7 @@
 #![no_main]
 
 use aya_ebpf::{
-    helpers::gen::bpf_ktime_get_ns,
+    helpers::bpf_ktime_get_ns,
     macros::{map, uprobe},
     maps::RingBuf,
     programs::ProbeContext,

Diff for: frame-analyzer/src/analyze_target.rs

@@ -78,5 +78,5 @@ impl AnalyzeTarget {
 }
 
 const unsafe fn trans(buf: &[u8]) -> FrameSignal {
-    ptr::read_unaligned(buf.as_ptr().cast::<FrameSignal>())
+    unsafe { ptr::read_unaligned(buf.as_ptr().cast::<FrameSignal>()) }
 }

Diff for: frame-analyzer/src/ebpf.rs

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-use aya::{include_bytes_aligned, Bpf};
+use aya::{Ebpf, include_bytes_aligned};
 use ctor::ctor;
 
 use crate::error::Result;
@@ -32,15 +32,15 @@ fn ebpf_workround() {
     unsafe { libc::setrlimit(libc::RLIMIT_MEMLOCK, &rlim) };
 }
 
-pub fn load_bpf() -> Result<Bpf> {
+pub fn load_bpf() -> Result<Ebpf> {
     // This will include eBPF object file as raw bytes at compile-time and load it at runtime.
     #[cfg(debug_assertions)]
-    let bpf = Bpf::load(include_bytes_aligned!(concat!(
+    let bpf = Ebpf::load(include_bytes_aligned!(concat!(
         env!("OUT_DIR"),
         "/ebpf_target/bpfel-unknown-none/debug/frame-analyzer-ebpf"
     )))?;
     #[cfg(not(debug_assertions))]
-    let bpf = Bpf::load(include_bytes_aligned!(concat!(
+    let bpf = Ebpf::load(include_bytes_aligned!(concat!(
         env!("OUT_DIR"),
         "/ebpf_target/bpfel-unknown-none/release/frame-analyzer-ebpf"
     )))?;

Diff for: frame-analyzer/src/error.rs

@@ -18,15 +18,15 @@
  */
 use std::io;
 
-use aya::{maps::MapError, programs::ProgramError, BpfError};
+use aya::{EbpfError, maps::MapError, programs::ProgramError};
 use thiserror::Error;
 
 pub type Result<T> = std::result::Result<T, AnalyzerError>;
 
 #[derive(Error, Debug)]
 pub enum AnalyzerError {
     #[error(transparent)]
-    BpfError(#[from] BpfError),
+    EbpfError(#[from] EbpfError),
     #[error(transparent)]
     BpfProgramError(#[from] ProgramError),
     #[error(transparent)]

Diff for: frame-analyzer/src/lib.rs

@@ -86,7 +86,7 @@ use std::{
     time::Duration,
 };
 
-use mio::{event::Event, unix::SourceFd, Events, Interest, Poll, Token};
+use mio::{Events, Interest, Poll, Token, event::Event, unix::SourceFd};
 
 use analyze_target::AnalyzeTarget;
 pub use error::AnalyzerError;

Diff for: frame-analyzer/src/uprobe.rs

@@ -17,15 +17,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 use aya::{
+    Ebpf,
     maps::{MapData, RingBuf},
     programs::UProbe,
-    Bpf,
 };
 
 use crate::{ebpf::load_bpf, error::Result};
 
 pub struct UprobeHandler {
-    bpf: Bpf,
+    bpf: Ebpf,
 }
 
 impl Drop for UprobeHandler {