xtask: use more aya-gen

xtask/src/codegen/aya_bpf_bindings.rs

@@ -4,11 +4,14 @@ use quote::ToTokens;
 use std::path::PathBuf;
 use structopt::StructOpt;
 
-use aya_gen::getters::{generate_getters_for_items, probe_read_getter};
+use aya_gen::{
+    bindgen,
+    getters::{generate_getters_for_items, probe_read_getter},
+    write_to_file, write_to_file_fmt,
+};
 use syn::{parse_str, Item};
 
 use crate::codegen::{
-    bindings::{self, bindgen},
     helpers::{expand_helpers, extract_helpers},
     Architecture,
 };
@@ -26,48 +29,56 @@ pub fn codegen(opts: CodegenOptions) -> Result<(), anyhow::Error> {
     let dir = PathBuf::from("bpf/aya-bpf-bindings");
     let generated = dir.join("src").join(opts.arch.to_string());
 
+    let mut bindgen = bindgen::builder()
+        .header(&*dir.join("include/bindings.h").to_string_lossy())
+        .clang_args(&["-I", &*opts.libbpf_dir.join("src").to_string_lossy()]);
+
     let types = ["bpf_map_.*"];
     let vars = ["BPF_.*", "bpf_.*"];
-    let mut cmd = bindgen(&types, &vars);
-    cmd.arg(&*dir.join("include/bindings.h").to_string_lossy());
-    cmd.arg("--");
-    cmd.arg("-I").arg(opts.libbpf_dir.join("src"));
 
-    let output = cmd.output()?;
+    for x in &types {
-    let bindings = std::str::from_utf8(&output.stdout)?;
+        bindgen = bindgen.whitelist_type(x);
+    }
 
-    if !output.status.success() {
+    for x in &vars {
-        eprintln!("{}", std::str::from_utf8(&output.stderr)?);
+        bindgen = bindgen.whitelist_var(x);
-        return Err(anyhow!("bindgen failed: {}", output.status));
     }
 
-    let mut tree = parse_str::<syn::File>(bindings).unwrap();
+    let bindings = bindgen
+        .generate()
+        .map_err(|_| anyhow!("bindgen failed"))?
+        .to_string();
+
+    let mut tree = parse_str::<syn::File>(&bindings).unwrap();
     let (indexes, helpers) = extract_helpers(&tree.items);
     let helpers = expand_helpers(&helpers);
     for index in indexes {
         tree.items[index] = Item::Verbatim(TokenStream::new())
     }
 
-    bindings::write(
+    // write the bindings, with the original helpers removed
-        &tree.to_token_stream().to_string(),
+    write_to_file(
-        "",
         &generated.join("bindings.rs"),
+        &tree.to_token_stream().to_string(),
     )?;
 
-    bindings::write(
+    // write the new helpers as expanded by expand_helpers()
-        &helpers.to_string(),
+    write_to_file_fmt(
-        "use super::bindings::*;",
         &generated.join("helpers.rs"),
+        &format!("use super::bindings::*; {}", helpers.to_string()),
     )?;
 
+    // write the bpf_probe_read() getters
     let bpf_probe_read = syn::parse_str("crate::bpf_probe_read").unwrap();
-    bindings::write(
+    write_to_file_fmt(
+        &generated.join("getters.rs"),
+        &format!(
+            "use super::bindings::*; {}",
             &generate_getters_for_items(&tree.items, |getter| {
                 probe_read_getter(getter, &bpf_probe_read)
             })
-        .to_string(),
+            .to_string()
-        "use super::bindings::*;",
+        ),
-        &generated.join("getters.rs"),
     )?;
 
     Ok(())

xtask/src/codegen/bindings.rs

@@ -1,36 +0,0 @@
-use std::{
-    fs::File,
-    io::{self, Write},
-    path::Path,
-    process::Command,
-};
-
-pub fn bindgen(types: &[&str], vars: &[&str]) -> Command {
-    let mut cmd = Command::new("bindgen");
-    cmd.arg("--no-layout-tests")
-        .arg("--use-core")
-        .arg("--ctypes-prefix")
-        .arg("::aya_bpf_cty")
-        .arg("--default-enum-style")
-        .arg("consts")
-        .arg("--no-prepend-enum-name");
-
-    for x in types {
-        cmd.arg("--whitelist-type").arg(x);
-    }
-
-    for x in vars {
-        cmd.arg("--whitelist-var").arg(x);
-    }
-
-    cmd
-}
-
-pub fn write(bindings: &str, header: &str, filename: &Path) -> io::Result<()> {
-    let mut file = File::create(&filename)?;
-    file.write(header.as_bytes())?;
-    file.write(bindings.as_bytes())?;
-
-    Command::new("rustfmt").arg(filename).status()?;
-    Ok(())
-}

xtask/src/codegen/mod.rs

@@ -1,5 +1,4 @@
 mod aya_bpf_bindings;
-mod bindings;
 mod helpers;
 
 use structopt::StructOpt;