sync up with upstream (#190)

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Changelog
 
+### 0.3.7
+
+- Tracking upstream to match version 0.7
+
 ### 0.3.4
 - Tracking upstream to match version 0.6.2
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "snmalloc-rs"
-version = "0.3.6"
+version = "0.3.7"
 authors = ["schrodingerzhu <[email protected]>"]
 edition = "2021"
 license = "MIT"
@@ -13,13 +13,13 @@ readme = "README.md"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [workspace]
-members = ["snmalloc-sys" ]
+members = ["snmalloc-sys"]
 
 [dependencies]
-snmalloc-sys = {version = "0.3.5", path = "snmalloc-sys", default-features = false }
+snmalloc-sys = { version = "0.3.7", path = "snmalloc-sys", default-features = false }
 
 [features]
-default = ["snmalloc-sys/build_cmake"]
+default = ["snmalloc-sys/build_cmake", "snmalloc-sys/usewait-on-address"]
 build_cc = ["snmalloc-sys/build_cc"]
 qemu = ["snmalloc-sys/qemu"]
 debug = ["snmalloc-sys/debug"]
@@ -32,4 +32,4 @@ check = ["snmalloc-sys/check"]
 lto = ["snmalloc-sys/lto"]
 notls = ["snmalloc-sys/notls"]
 stats = ["snmalloc-sys/stats"]
-#nowait-on-target = ["snmalloc-sys/nowait-on-target"]
+usewait-on-address = ["snmalloc-sys/usewait-on-address"]

snmalloc-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "snmalloc-sys"
-version = "0.3.6"
+version = "0.3.7"
 authors = ["schrodingerzhu <[email protected]>"]
 edition = "2021"
 license = "MIT"
@@ -13,8 +13,8 @@ build = "build.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-cc = {version = "1.0",optional=true}
-cmake = {version = "0.1",optional=true}
+cc = { version = "1.0", optional = true }
+cmake = { version = "0.1", optional = true }
 
 [features]
 default = ["build_cmake"]
@@ -31,4 +31,4 @@ check = []
 lto = []
 notls = []
 stats = []
-#usewait-on-target = []
+usewait-on-address = []

snmalloc-sys/build.rs

@@ -260,8 +260,9 @@ fn main() {
     let mut dst = cfg.build_target(target).build();
 
     dst.push("./build");
-
-    println!("cargo:rustc-link-lib={}", target);
+    // we need to specify static modifier, otherwise the linker may not be smart enough to resolve
+    // dependency from snmalloc to libc/libgcc_s
+    println!("cargo:rustc-link-lib=static={}", target);
 
     if cfg!(all(windows, target_env = "msvc")) {
         if cfg!(not(feature = "win8compat")) {

src/lib.rs

@@ -38,6 +38,7 @@ unsafe impl GlobalAlloc for SnMalloc {
     /// The client must assure the following things:
     /// - `alignment` is greater than zero
     /// - Other constrains are the same as the rust standard library.
+    ///
     /// The program may be forced to abort if the constrains are not full-filled.
     #[inline(always)]
     unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
@@ -48,6 +49,7 @@ unsafe impl GlobalAlloc for SnMalloc {
     /// The client must assure the following things:
     /// - the memory is acquired using the same allocator and the pointer points to the start position.
     /// - Other constrains are the same as the rust standard library.
+    ///
     /// The program may be forced to abort if the constrains are not full-filled.
     #[inline(always)]
     unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
@@ -68,6 +70,7 @@ unsafe impl GlobalAlloc for SnMalloc {
     /// - the memory is acquired using the same allocator and the pointer points to the start position
     /// - `alignment` fulfills all the requirements as `rust_alloc`
     /// - Other constrains are the same as the rust standard library.
+    ///
     /// The program may be forced to abort if the constrains are not full-filled.
     #[inline(always)]
     unsafe fn realloc(&self, ptr: *mut u8, layout: Layout, new_size: usize) -> *mut u8 {