update proposal.

- snmalloc to last version.
- then adding a handful of available build options, diabling TLS support and LTO linkage.

Signed-off-by: David Carlier <[email protected]>

Cargo.toml

@@ -28,4 +28,6 @@ native-cpu = ["snmalloc-sys/native-cpu"]
 local_dynamic_tls = ["snmalloc-sys/local_dynamic_tls"]
 win8compat = ["snmalloc-sys/win8compat"]
 usecxx17 = ["snmalloc-sys/usecxx17"]
-check = ["snmalloc-sys/check"]
+check = ["snmalloc-sys/check"]
+lto = ["snmalloc-sys/lto"]
+notls = ["snmalloc-sys/notls"]

snmalloc-sys/Cargo.toml

@@ -28,3 +28,5 @@ local_dynamic_tls = []
 win8compat = []
 usecxx17 = []
 check = []
+lto = []
+notls = []

snmalloc-sys/build.rs

@@ -108,12 +108,22 @@ fn main() {
     }
 
     if cfg!(feature = "cache-friendly") {
-        eprintln!("cache-friendly feature flag is deprecated and no longer has any effect. \
-            it may be removed in a future release");
+        eprintln!(
+            "cache-friendly feature flag is deprecated and no longer has any effect. \
+            it may be removed in a future release"
+        );
         // The following code no longer works
         // build.define("CACHE_FRIENDLY_OFFSET", "64");
     }
 
+    if cfg!(feature = "lto") {
+        build.define("SNMALLOC_IPO", "ON");
+    }
+
+    if cfg!(feature = "notls") {
+        build.define("SNMALLOC_ENABLE_DYNAMIC_LOADING", "ON");
+    }
+
     build.compile(target);
 
     if target_env == "msvc" {
@@ -140,14 +150,16 @@ fn main() {
         // no need
     } else {
         // link c++ runtime
-        println!("cargo:rustc-link-lib={}",
-                 std::env::var("CXXSTDLIB").unwrap_or_else(|_| {
-                     if cfg!(target_os = "macos") || cfg!(target_os = "openbsd") {
-                         "c++".to_string()
-                     } else {
-                         "stdc++".to_string()
-                     }
-                 }))
+        println!(
+            "cargo:rustc-link-lib={}",
+            std::env::var("CXXSTDLIB").unwrap_or_else(|_| {
+                if cfg!(target_os = "macos") || cfg!(target_os = "openbsd") {
+                    "c++".to_string()
+                } else {
+                    "stdc++".to_string()
+                }
+            })
+        )
     }
 }
 
@@ -305,13 +317,15 @@ fn main() {
         // not need for explicit c++ runtime
     } else {
         // link c++ runtime
-        println!("cargo:rustc-link-lib={}",
-                 std::env::var("CXXSTDLIB").unwrap_or_else(|_| {
-                     if cfg!(target_os = "macos") || cfg!(target_os = "openbsd") {
-                         "c++".to_string()
-                     } else {
-                         "stdc++".to_string()
-                     }
-                 }))
+        println!(
+            "cargo:rustc-link-lib={}",
+            std::env::var("CXXSTDLIB").unwrap_or_else(|_| {
+                if cfg!(target_os = "macos") || cfg!(target_os = "openbsd") {
+                    "c++".to_string()
+                } else {
+                    "stdc++".to_string()
+                }
+            })
+        )
     }
 }

src/lib.rs

@@ -44,7 +44,6 @@ unsafe impl GlobalAlloc for SnMalloc {
         ffi::sn_rust_alloc(layout.align(), layout.size()) as _
     }
 
-
     /// De-allocate the memory at the given address with the given alignment and size.
     /// The client must assure the following things:
     /// - the memory is acquired using the same allocator and the pointer points to the start position.
@@ -113,4 +112,15 @@ mod tests {
             alloc.dealloc(ptr, layout);
         }
     }
+
+    #[test]
+    fn it_frees_large_alloc() {
+        unsafe {
+            let layout = Layout::from_size_align(1 << 20, 32).unwrap();
+            let alloc = SnMalloc;
+
+            let ptr = alloc.alloc(layout);
+            alloc.dealloc(ptr, layout);
+        }
+    }
 }