Merge pull request #34 from linxGnu/update_mimalloc

NO-ISSUE Bump to latest mimalloc, adding tests, update directive condition

Author: octavonce

Cargo.toml

@@ -20,7 +20,7 @@ members = ["libmimalloc-sys", "libmimalloc-sys/sys-test"]
 travis-ci = { repository = "purpleprotocol/mimalloc_rust" }
 
 [dependencies]
-libmimalloc-sys = { path = "libmimalloc-sys", version = "0.1.15", default-features = false }
+libmimalloc-sys = { path = "libmimalloc-sys", version = "0.1.16", default-features = false }
 
 [features]
 default = ["secure"]

libmimalloc-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "libmimalloc-sys"
-version = "0.1.15"
+version = "0.1.16"
 authors = ["Octavian Oncescu <octavonce@gmail.com>"]
 edition = "2018"
 repository = "https://github.com/purpleprotocol/mimalloc_rust/tree/master/libmimalloc-sys"

libmimalloc-sys/c_src/mimalloc

@@ -67,7 +67,8 @@ unsafe impl GlobalAlloc for MiMalloc {
         if layout.align() <= MIN_ALIGN && layout.align() <= layout.size() {
             mi_malloc(layout.size()) as *mut u8
         } else {
-            if cfg!(target_os = "macos") && layout.align() > (1 << 31) {
+            #[cfg(target_os = "macos")]
+            if layout.align() > (1 << 31) {
                 return core::ptr::null_mut();
             }
 
@@ -80,7 +81,8 @@ unsafe impl GlobalAlloc for MiMalloc {
         if layout.align() <= MIN_ALIGN && layout.align() <= layout.size() {
             mi_zalloc(layout.size()) as *mut u8
         } else {
-            if cfg!(target_os = "macos") && layout.align() > (1 << 31) {
+            #[cfg(target_os = "macos")]
+            if layout.align() > (1 << 31) {
                 return core::ptr::null_mut();
             }
 
@@ -118,6 +120,17 @@ mod tests {
         }
     }
 
+    #[test]
+    fn it_frees_allocated_big_memory() {
+        unsafe {
+            let layout = Layout::from_size_align(1 << 20, 32).unwrap();
+            let alloc = MiMalloc;
+
+            let ptr = alloc.alloc(layout);
+            alloc.dealloc(ptr, layout);
+        }
+    }
+
     #[test]
     fn it_frees_zero_allocated_memory() {
         unsafe {
@@ -129,6 +142,17 @@ mod tests {
         }
     }
 
+    #[test]
+    fn it_frees_zero_allocated_big_memory() {
+        unsafe {
+            let layout = Layout::from_size_align(1 << 20, 32).unwrap();
+            let alloc = MiMalloc;
+
+            let ptr = alloc.alloc_zeroed(layout);
+            alloc.dealloc(ptr, layout);
+        }
+    }
+
     #[test]
     fn it_frees_reallocated_memory() {
         unsafe {
@@ -140,4 +164,16 @@ mod tests {
             alloc.dealloc(ptr, layout);
         }
     }
+
+    #[test]
+    fn it_frees_reallocated_big_memory() {
+        unsafe {
+            let layout = Layout::from_size_align(1 << 20, 32).unwrap();
+            let alloc = MiMalloc;
+
+            let ptr = alloc.alloc(layout);
+            let ptr = alloc.realloc(ptr, layout, 2 << 20);
+            alloc.dealloc(ptr, layout);
+        }
+    }
 }