rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Improve reallocation in alloc_system on Windows

Browse Source
This commit is contained in:
Peter Atashian
2017-05-31 08:27:02 -04:00
parent 558cd1e393
commit 077c23e987
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/liballoc_system/lib.rs
View File

@@ -171,6 +171,8 @@ mod imp {
#[cfg(windows)] #[cfg(windows)]
#[allow(bad_style)] #[allow(bad_style)]
mod imp { mod imp {
use core::cmp::min;
use core::ptr::copy_nonoverlapping;
use MIN_ALIGN; use MIN_ALIGN;
type LPVOID = *mut u8; type LPVOID = *mut u8;
@@ -225,19 +227,16 @@ mod imp {
allocate_with_flags(size, align, HEAP_ZERO_MEMORY) allocate_with_flags(size, align, HEAP_ZERO_MEMORY)
} }
pub unsafe fn reallocate(ptr: *mut u8, _old_size: usize, size: usize, align: usize) -> *mut u8 { pub unsafe fn reallocate(ptr: *mut u8, old_size: usize, size: usize, align: usize) -> *mut u8 {
if align <= MIN_ALIGN { if align <= MIN_ALIGN {
HeapReAlloc(GetProcessHeap(), 0, ptr as LPVOID, size as SIZE_T) as *mut u8 HeapReAlloc(GetProcessHeap(), 0, ptr as LPVOID, size as SIZE_T) as *mut u8
} else { } else {
let header = get_header(ptr); let new = allocate(size, align);
let new = HeapReAlloc(GetProcessHeap(), if !new.is_null() {
0, copy_nonoverlapping(ptr, new, min(size, old_size));
header.0 as LPVOID, deallocate(ptr, old_size, align);
(size + align) as SIZE_T) as *mut u8;
if new.is_null() {
return new;
} }
align_ptr(new, align) new
} }
} }
@@ -246,15 +245,19 @@ mod imp {
size: usize, size: usize,
align: usize) align: usize)
-> usize { -> usize {
if align <= MIN_ALIGN { let new = if align <= MIN_ALIGN {
let new = HeapReAlloc(GetProcessHeap(), HeapReAlloc(GetProcessHeap(),
HEAP_REALLOC_IN_PLACE_ONLY, HEAP_REALLOC_IN_PLACE_ONLY,
ptr as LPVOID, ptr as LPVOID,
size as SIZE_T) as *mut u8; size as SIZE_T) as *mut u8
if new.is_null() { old_size } else { size }
} else { } else {
old_size let header = get_header(ptr);
} HeapReAlloc(GetProcessHeap(),
HEAP_REALLOC_IN_PLACE_ONLY,
header.0 as LPVOID,
size + align as SIZE_T) as *mut u8
};
if new.is_null() { old_size } else { size }
} }
pub unsafe fn deallocate(ptr: *mut u8, _old_size: usize, align: usize) { pub unsafe fn deallocate(ptr: *mut u8, _old_size: usize, align: usize) {