Draft: Add custom allocator support

Signed-off-by: Jonathan Schwender <[email protected]>

Author: jschwe

mozjs-sys/Cargo.toml

@@ -16,6 +16,8 @@ name = "mozjs_sys"
 doctest = false
 
 [features]
+default = ["custom-malloc"] # Testing only - remove me
+custom-malloc = []
 debugmozjs = []
 profilemozjs = []
 jit = []
@@ -27,6 +29,8 @@ crown = []
 oom_with_hook = []
 
 [dependencies]
+# remove-me
+mimalloc = { version = "0.1.48", optional = true}
 libc.workspace = true
 encoding_c = "0.9.8"
 encoding_c_mem = "0.2.6"

mozjs-sys/build.rs

@@ -138,6 +138,7 @@ fn main() {
 
 fn build_spidermonkey(build_dir: &Path) {
     let target = env::var("TARGET").unwrap();
+    let cargo_manifest_dir = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap());
     let make;
 
     #[cfg(windows)]
@@ -210,24 +211,42 @@ fn build_spidermonkey(build_dir: &Path) {
     }
 
     cppflags.push(get_cc_rs_env_os("CPPFLAGS").unwrap_or_default());
-    cmd.env("CPPFLAGS", cppflags);
 
     if let Some(makeflags) = env::var_os("CARGO_MAKEFLAGS") {
         cmd.env("MAKEFLAGS", makeflags);
     }
 
     let mut cxxflags = vec![];
 
+    if env::var_os("CARGO_FEATURE_CUSTOM_MALLOC").is_some() {
+        let mut flags = vec![];
+        // let include_dir = env::var("SERVO_CUSTOM_MALLOC_INCLUDE_DIR").expect("Required variable not set with feature custom-malloc");
+        // flags.push(format!("-I{}", &include_dir.replace("\\", "/")));
+        let header_dir = cargo_manifest_dir.join("src/custom_alloc").to_str().expect("utf-8").to_string();
+        flags.push(format!("-I{}", header_dir));
+        println!("cargo:rerun-if-changed={}", header_dir);
+
+        cppflags.extend(flags.iter().map(|s| OsString::from(s)));
+        cxxflags.extend(flags);
+        // Todo: from embedder
+        cppflags.push("-DSERVO_EMBEDDER_MALLOC_PREFIX=mi_");
+        cppflags.push("-DSERVO_EMBEDDER_MEMORY");
+        cxxflags.push("-DSERVO_EMBEDDER_MALLOC_PREFIX=mi_".to_string());
+        cxxflags.push("-DSERVO_EMBEDDER_MEMORY".to_string());
+
+    }
+
     if target.contains("apple") || target.contains("freebsd") || target.contains("ohos") {
         cxxflags.push(String::from("-stdlib=libc++"));
     }
 
+    cmd.env("CPPFLAGS", cppflags);
+
     let base_cxxflags = env::var("CXXFLAGS").unwrap_or_default();
     let mut cxxflags = cxxflags.join(" ");
     cxxflags.push_str(&base_cxxflags);
     cmd.env("CXXFLAGS", cxxflags);
 
-    let cargo_manifest_dir = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap());
     let result = cmd
         .args(&["-R", "-f"])
         .arg(cargo_manifest_dir.join("makefile.cargo"))
@@ -292,6 +311,13 @@ fn build(build_dir: &Path, target: BuildTarget) {
 
     build.flag(include_file_flag(build.get_compiler().is_like_msvc()));
     build.flag(&js_config_path(build_dir));
+    let cargo_manifest_dir = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap());
+
+    let header_dir = cargo_manifest_dir.join("src/custom_alloc").to_str().expect("utf-8").to_string();
+    build.include(&header_dir);
+    // fixme
+    build.flag("-DSERVO_EMBEDDER_MALLOC_PREFIX=mi_");
+    println!("cargo:rerun-if-changed={}", header_dir);
 
     for path in target.include_paths(build_dir) {
         build.include(path);
@@ -313,6 +339,10 @@ fn build_bindings(build_dir: &Path, target: BuildTarget) {
     config &= !CodegenConfig::DESTRUCTORS;
     config &= !CodegenConfig::METHODS;
 
+    let cargo_manifest_dir = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap());
+
+    let header_dir = cargo_manifest_dir.join("src/custom_alloc").to_str().expect("utf-8").to_string();
+
     let mut builder = bindgen::builder()
         .rust_target(minimum_rust_target())
         .header(target.path())
@@ -324,6 +354,7 @@ fn build_bindings(build_dir: &Path, target: BuildTarget) {
         .size_t_is_usize(true)
         .enable_cxx_namespaces()
         .with_codegen_config(config)
+        .clang_arg(format!("-I{}", header_dir))
         .clang_args(cc_flags(true));
 
     if env::var("TARGET").unwrap().contains("wasi") {
@@ -432,6 +463,8 @@ fn link_static_lib_binaries(build_dir: &Path) {
         // needing to use the WASI-SDK's clang for linking, which is annoying.
         println!("cargo:rustc-link-lib=stdc++")
     }
+    // TODO: link against lib from env
+    // println!("cargo:rustc-link-lib=mimalloc");
 
     if target.contains("wasi") {
         println!("cargo:rustc-link-lib=wasi-emulated-getpid");
@@ -463,6 +496,9 @@ fn should_build_from_source() -> bool {
     } else if env::var_os("CARGO_FEATURE_INTL").is_none() {
         println!("intl feature is disabled. Building from source directly.");
         true
+    } else if env::var_os("CARGO_FEATURE_CUSTOM_ALLOC").is_some() {
+        println!("custom-alloc feature is enabled. Building from source directly.");
+        true
     } else if !env::var_os("CARGO_FEATURE_JIT").is_some() {
         println!("jit feature is NOT enabled. Building from source directly.");
         true