This commit is the standard API stabilization commit for the 1.6 release cycle. The list of issues and APIs below have all been through their cycle-long FCP and the libs team decisions are listed below Stabilized APIs * `Read::read_exact` * `ErrorKind::UnexpectedEof` (renamed from `UnexpectedEOF`) * libcore -- this was a bit of a nuanced stabilization, the crate itself is now marked as `#[stable]` and the methods appearing via traits for primitives like `char` and `str` are now also marked as stable. Note that the extension traits themeselves are marked as unstable as they're imported via the prelude. The `try!` macro was also moved from the standard library into libcore to have the same interface. Otherwise the functions all have copied stability from the standard library now. * The `#![no_std]` attribute * `fs::DirBuilder` * `fs::DirBuilder::new` * `fs::DirBuilder::recursive` * `fs::DirBuilder::create` * `os::unix::fs::DirBuilderExt` * `os::unix::fs::DirBuilderExt::mode` * `vec::Drain` * `vec::Vec::drain` * `string::Drain` * `string::String::drain` * `vec_deque::Drain` * `vec_deque::VecDeque::drain` * `collections::hash_map::Drain` * `collections::hash_map::HashMap::drain` * `collections::hash_set::Drain` * `collections::hash_set::HashSet::drain` * `collections::binary_heap::Drain` * `collections::binary_heap::BinaryHeap::drain` * `Vec::extend_from_slice` (renamed from `push_all`) * `Mutex::get_mut` * `Mutex::into_inner` * `RwLock::get_mut` * `RwLock::into_inner` * `Iterator::min_by_key` (renamed from `min_by`) * `Iterator::max_by_key` (renamed from `max_by`) Deprecated APIs * `ErrorKind::UnexpectedEOF` (renamed to `UnexpectedEof`) * `OsString::from_bytes` * `OsStr::to_cstring` * `OsStr::to_bytes` * `fs::walk_dir` and `fs::WalkDir` * `path::Components::peek` * `slice::bytes::MutableByteVector` * `slice::bytes::copy_memory` * `Vec::push_all` (renamed to `extend_from_slice`) * `Duration::span` * `IpAddr` * `SocketAddr::ip` * `Read::tee` * `io::Tee` * `Write::broadcast` * `io::Broadcast` * `Iterator::min_by` (renamed to `min_by_key`) * `Iterator::max_by` (renamed to `max_by_key`) * `net::lookup_addr` New APIs (still unstable) * `<[T]>::sort_by_key` (added to mirror `min_by_key`) Closes #27585 Closes #27704 Closes #27707 Closes #27710 Closes #27711 Closes #27727 Closes #27740 Closes #27744 Closes #27799 Closes #27801 cc #27801 (doesn't close as `Chars` is still unstable) Closes #28968
114 lines
4.2 KiB
Rust
114 lines
4.2 KiB
Rust
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
|
|
// file at the top-level directory of this distribution and at
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
// option. This file may not be copied, modified, or distributed
|
|
// except according to those terms.
|
|
|
|
#![cfg_attr(stage0, feature(custom_attribute))]
|
|
#![crate_name = "alloc_jemalloc"]
|
|
#![crate_type = "rlib"]
|
|
#![cfg_attr(stage0, staged_api)]
|
|
#![no_std]
|
|
#![cfg_attr(not(stage0), allocator)]
|
|
#![cfg_attr(stage0, allow(improper_ctypes))]
|
|
#![unstable(feature = "alloc_jemalloc",
|
|
reason = "this library is unlikely to be stabilized in its current \
|
|
form or name",
|
|
issue = "27783")]
|
|
#![feature(allocator)]
|
|
#![feature(libc)]
|
|
#![feature(staged_api)]
|
|
#![cfg_attr(stage0, feature(no_std))]
|
|
|
|
extern crate libc;
|
|
|
|
use libc::{c_int, c_void, size_t};
|
|
|
|
// Linkage directives to pull in jemalloc and its dependencies.
|
|
//
|
|
// On some platforms we need to be sure to link in `pthread` which jemalloc
|
|
// depends on, and specifically on android we need to also link to libgcc.
|
|
// Currently jemalloc is compiled with gcc which will generate calls to
|
|
// intrinsics that are libgcc specific (e.g. those intrinsics aren't present in
|
|
// libcompiler-rt), so link that in to get that support.
|
|
#[link(name = "jemalloc", kind = "static")]
|
|
#[cfg_attr(target_os = "android", link(name = "gcc"))]
|
|
#[cfg_attr(all(not(windows),
|
|
not(target_os = "android"),
|
|
not(target_env = "musl")),
|
|
link(name = "pthread"))]
|
|
extern "C" {
|
|
fn je_mallocx(size: size_t, flags: c_int) -> *mut c_void;
|
|
fn je_rallocx(ptr: *mut c_void, size: size_t, flags: c_int) -> *mut c_void;
|
|
fn je_xallocx(ptr: *mut c_void, size: size_t, extra: size_t, flags: c_int) -> size_t;
|
|
fn je_sdallocx(ptr: *mut c_void, size: size_t, flags: c_int);
|
|
fn je_nallocx(size: size_t, flags: c_int) -> size_t;
|
|
}
|
|
|
|
// The minimum alignment guaranteed by the architecture. This value is used to
|
|
// add fast paths for low alignment values. In practice, the alignment is a
|
|
// constant at the call site and the branch will be optimized out.
|
|
#[cfg(all(any(target_arch = "arm",
|
|
target_arch = "mips",
|
|
target_arch = "mipsel",
|
|
target_arch = "powerpc")))]
|
|
const MIN_ALIGN: usize = 8;
|
|
#[cfg(all(any(target_arch = "x86",
|
|
target_arch = "x86_64",
|
|
target_arch = "aarch64")))]
|
|
const MIN_ALIGN: usize = 16;
|
|
|
|
// MALLOCX_ALIGN(a) macro
|
|
fn mallocx_align(a: usize) -> c_int {
|
|
a.trailing_zeros() as c_int
|
|
}
|
|
|
|
fn align_to_flags(align: usize) -> c_int {
|
|
if align <= MIN_ALIGN {
|
|
0
|
|
} else {
|
|
mallocx_align(align)
|
|
}
|
|
}
|
|
|
|
#[no_mangle]
|
|
pub extern "C" fn __rust_allocate(size: usize, align: usize) -> *mut u8 {
|
|
let flags = align_to_flags(align);
|
|
unsafe { je_mallocx(size as size_t, flags) as *mut u8 }
|
|
}
|
|
|
|
#[no_mangle]
|
|
pub extern "C" fn __rust_reallocate(ptr: *mut u8,
|
|
_old_size: usize,
|
|
size: usize,
|
|
align: usize)
|
|
-> *mut u8 {
|
|
let flags = align_to_flags(align);
|
|
unsafe { je_rallocx(ptr as *mut c_void, size as size_t, flags) as *mut u8 }
|
|
}
|
|
|
|
#[no_mangle]
|
|
pub extern "C" fn __rust_reallocate_inplace(ptr: *mut u8,
|
|
_old_size: usize,
|
|
size: usize,
|
|
align: usize)
|
|
-> usize {
|
|
let flags = align_to_flags(align);
|
|
unsafe { je_xallocx(ptr as *mut c_void, size as size_t, 0, flags) as usize }
|
|
}
|
|
|
|
#[no_mangle]
|
|
pub extern "C" fn __rust_deallocate(ptr: *mut u8, old_size: usize, align: usize) {
|
|
let flags = align_to_flags(align);
|
|
unsafe { je_sdallocx(ptr as *mut c_void, old_size as size_t, flags) }
|
|
}
|
|
|
|
#[no_mangle]
|
|
pub extern "C" fn __rust_usable_size(size: usize, align: usize) -> usize {
|
|
let flags = align_to_flags(align);
|
|
unsafe { je_nallocx(size as size_t, flags) as usize }
|
|
}
|