2013-04-21 21:03:52 -05:00
|
|
|
// Copyright 2013 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.
|
|
|
|
|
|
|
|
//! The local, garbage collected heap
|
|
|
|
|
2014-05-13 18:10:05 -05:00
|
|
|
use alloc::util;
|
2014-01-06 18:48:51 -06:00
|
|
|
use iter::Iterator;
|
2014-05-06 21:03:14 -05:00
|
|
|
use libc::{c_void, free};
|
2013-10-26 03:10:39 -05:00
|
|
|
use mem;
|
2013-04-21 21:03:52 -05:00
|
|
|
use ops::Drop;
|
2013-08-08 13:38:10 -05:00
|
|
|
use option::{Option, None, Some};
|
2014-01-06 18:48:51 -06:00
|
|
|
use ptr::RawPtr;
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 12:34:51 -05:00
|
|
|
use ptr;
|
|
|
|
use raw;
|
2014-05-09 21:59:46 -05:00
|
|
|
use rt::libc_heap;
|
2013-06-22 03:09:06 -05:00
|
|
|
use rt::local::Local;
|
|
|
|
use rt::task::Task;
|
2014-03-06 12:22:21 -06:00
|
|
|
use slice::{ImmutableVector, Vector};
|
2014-03-20 02:35:51 -05:00
|
|
|
use vec::Vec;
|
2013-04-21 21:03:52 -05:00
|
|
|
|
2013-10-26 03:10:39 -05:00
|
|
|
// This has no meaning with out rtdebug also turned on.
|
2013-12-08 01:55:28 -06:00
|
|
|
#[cfg(rtdebug)]
|
2013-10-26 03:10:39 -05:00
|
|
|
static TRACK_ALLOCATIONS: int = 0;
|
2013-12-08 01:55:28 -06:00
|
|
|
#[cfg(rtdebug)]
|
2013-10-26 03:10:39 -05:00
|
|
|
static MAGIC: u32 = 0xbadc0ffe;
|
2013-06-22 03:09:06 -05:00
|
|
|
|
2013-10-26 03:10:39 -05:00
|
|
|
pub type Box = raw::Box<()>;
|
2013-06-22 03:09:06 -05:00
|
|
|
|
2013-10-26 03:10:39 -05:00
|
|
|
pub struct MemoryRegion {
|
2014-03-27 17:09:47 -05:00
|
|
|
allocations: Vec<*AllocHeader>,
|
|
|
|
live_allocations: uint,
|
2013-06-22 03:09:06 -05:00
|
|
|
}
|
2013-04-21 21:03:52 -05:00
|
|
|
|
|
|
|
pub struct LocalHeap {
|
2014-03-27 17:09:47 -05:00
|
|
|
memory_region: MemoryRegion,
|
2013-10-26 03:10:39 -05:00
|
|
|
|
2014-03-27 17:09:47 -05:00
|
|
|
live_allocs: *mut raw::Box<()>,
|
2013-04-21 21:03:52 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
impl LocalHeap {
|
2014-01-15 03:45:12 -06:00
|
|
|
#[inline]
|
2013-04-21 21:03:52 -05:00
|
|
|
pub fn new() -> LocalHeap {
|
2013-10-26 03:10:39 -05:00
|
|
|
let region = MemoryRegion {
|
2014-02-10 16:41:57 -06:00
|
|
|
allocations: Vec::new(),
|
2013-10-26 03:10:39 -05:00
|
|
|
live_allocations: 0,
|
|
|
|
};
|
|
|
|
LocalHeap {
|
|
|
|
memory_region: region,
|
|
|
|
live_allocs: ptr::mut_null(),
|
2013-04-21 21:03:52 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-15 03:45:12 -06:00
|
|
|
#[inline]
|
2014-02-05 22:05:30 -06:00
|
|
|
pub fn alloc(&mut self, drop_glue: fn(*mut u8), size: uint, align: uint) -> *mut Box {
|
2014-05-13 18:10:05 -05:00
|
|
|
let total_size = util::get_box_size(size, align);
|
2014-02-05 22:05:30 -06:00
|
|
|
let alloc = self.memory_region.malloc(total_size);
|
|
|
|
{
|
|
|
|
// Make sure that we can't use `mybox` outside of this scope
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 12:34:51 -05:00
|
|
|
let mybox: &mut Box = unsafe { mem::transmute(alloc) };
|
2014-02-05 22:05:30 -06:00
|
|
|
// Clear out this box, and move it to the front of the live
|
|
|
|
// allocations list
|
|
|
|
mybox.drop_glue = drop_glue;
|
|
|
|
mybox.ref_count = 1;
|
|
|
|
mybox.prev = ptr::mut_null();
|
|
|
|
mybox.next = self.live_allocs;
|
|
|
|
if !self.live_allocs.is_null() {
|
|
|
|
unsafe { (*self.live_allocs).prev = alloc; }
|
|
|
|
}
|
|
|
|
self.live_allocs = alloc;
|
|
|
|
}
|
|
|
|
return alloc;
|
|
|
|
}
|
|
|
|
|
2014-01-15 03:45:12 -06:00
|
|
|
#[inline]
|
2013-10-26 03:10:39 -05:00
|
|
|
pub fn realloc(&mut self, ptr: *mut Box, size: uint) -> *mut Box {
|
|
|
|
// Make sure that we can't use `mybox` outside of this scope
|
|
|
|
let total_size = size + mem::size_of::<Box>();
|
|
|
|
let new_box = self.memory_region.realloc(ptr, total_size);
|
|
|
|
{
|
|
|
|
// Fix links because we could have moved around
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 12:34:51 -05:00
|
|
|
let mybox: &mut Box = unsafe { mem::transmute(new_box) };
|
2013-10-26 03:10:39 -05:00
|
|
|
if !mybox.prev.is_null() {
|
|
|
|
unsafe { (*mybox.prev).next = new_box; }
|
|
|
|
}
|
|
|
|
if !mybox.next.is_null() {
|
|
|
|
unsafe { (*mybox.next).prev = new_box; }
|
|
|
|
}
|
2013-06-21 21:40:00 -05:00
|
|
|
}
|
2013-10-26 03:10:39 -05:00
|
|
|
if self.live_allocs == ptr {
|
|
|
|
self.live_allocs = new_box;
|
|
|
|
}
|
|
|
|
return new_box;
|
2013-06-21 21:40:00 -05:00
|
|
|
}
|
|
|
|
|
2014-01-15 03:45:12 -06:00
|
|
|
#[inline]
|
2014-02-05 22:05:30 -06:00
|
|
|
pub fn free(&mut self, alloc: *mut Box) {
|
|
|
|
{
|
|
|
|
// Make sure that we can't use `mybox` outside of this scope
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 12:34:51 -05:00
|
|
|
let mybox: &mut Box = unsafe { mem::transmute(alloc) };
|
2014-02-05 22:05:30 -06:00
|
|
|
|
|
|
|
// Unlink it from the linked list
|
|
|
|
if !mybox.prev.is_null() {
|
|
|
|
unsafe { (*mybox.prev).next = mybox.next; }
|
|
|
|
}
|
|
|
|
if !mybox.next.is_null() {
|
|
|
|
unsafe { (*mybox.next).prev = mybox.prev; }
|
|
|
|
}
|
|
|
|
if self.live_allocs == alloc {
|
|
|
|
self.live_allocs = mybox.next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
self.memory_region.free(alloc);
|
|
|
|
}
|
2013-04-21 21:03:52 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
impl Drop for LocalHeap {
|
2013-09-16 20:18:07 -05:00
|
|
|
fn drop(&mut self) {
|
2013-10-26 03:10:39 -05:00
|
|
|
assert!(self.live_allocs.is_null());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[cfg(rtdebug)]
|
|
|
|
struct AllocHeader {
|
|
|
|
magic: u32,
|
|
|
|
index: i32,
|
|
|
|
size: u32,
|
|
|
|
}
|
|
|
|
#[cfg(not(rtdebug))]
|
|
|
|
struct AllocHeader;
|
|
|
|
|
|
|
|
impl AllocHeader {
|
|
|
|
#[cfg(rtdebug)]
|
|
|
|
fn init(&mut self, size: u32) {
|
|
|
|
if TRACK_ALLOCATIONS > 0 {
|
|
|
|
self.magic = MAGIC;
|
|
|
|
self.index = -1;
|
|
|
|
self.size = size;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#[cfg(not(rtdebug))]
|
|
|
|
fn init(&mut self, _size: u32) {}
|
|
|
|
|
|
|
|
#[cfg(rtdebug)]
|
|
|
|
fn assert_sane(&self) {
|
|
|
|
if TRACK_ALLOCATIONS > 0 {
|
|
|
|
rtassert!(self.magic == MAGIC);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#[cfg(not(rtdebug))]
|
|
|
|
fn assert_sane(&self) {}
|
|
|
|
|
|
|
|
#[cfg(rtdebug)]
|
|
|
|
fn update_size(&mut self, size: u32) {
|
|
|
|
if TRACK_ALLOCATIONS > 0 {
|
|
|
|
self.size = size;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#[cfg(not(rtdebug))]
|
|
|
|
fn update_size(&mut self, _size: u32) {}
|
|
|
|
|
2013-12-11 19:04:50 -06:00
|
|
|
fn as_box(&mut self) -> *mut Box {
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 12:34:51 -05:00
|
|
|
let myaddr: uint = unsafe { mem::transmute(self) };
|
2013-10-26 03:10:39 -05:00
|
|
|
(myaddr + AllocHeader::size()) as *mut Box
|
|
|
|
}
|
|
|
|
|
|
|
|
fn size() -> uint {
|
|
|
|
// For some platforms, 16 byte alignment is required.
|
|
|
|
let ptr_size = 16;
|
|
|
|
let header_size = mem::size_of::<AllocHeader>();
|
|
|
|
return (header_size + ptr_size - 1) / ptr_size * ptr_size;
|
|
|
|
}
|
|
|
|
|
2013-12-11 19:04:50 -06:00
|
|
|
fn from(a_box: *mut Box) -> *mut AllocHeader {
|
|
|
|
(a_box as uint - AllocHeader::size()) as *mut AllocHeader
|
2013-10-26 03:10:39 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl MemoryRegion {
|
2014-01-15 03:45:12 -06:00
|
|
|
#[inline]
|
2013-10-26 03:10:39 -05:00
|
|
|
fn malloc(&mut self, size: uint) -> *mut Box {
|
|
|
|
let total_size = size + AllocHeader::size();
|
|
|
|
let alloc: *AllocHeader = unsafe {
|
2014-05-09 21:59:46 -05:00
|
|
|
libc_heap::malloc_raw(total_size) as *AllocHeader
|
2013-10-26 03:10:39 -05:00
|
|
|
};
|
|
|
|
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 12:34:51 -05:00
|
|
|
let alloc: &mut AllocHeader = unsafe { mem::transmute(alloc) };
|
2013-10-26 03:10:39 -05:00
|
|
|
alloc.init(size as u32);
|
|
|
|
self.claim(alloc);
|
|
|
|
self.live_allocations += 1;
|
|
|
|
|
2013-12-11 19:04:50 -06:00
|
|
|
return alloc.as_box();
|
2013-10-26 03:10:39 -05:00
|
|
|
}
|
|
|
|
|
2014-01-15 03:45:12 -06:00
|
|
|
#[inline]
|
2013-12-11 19:04:50 -06:00
|
|
|
fn realloc(&mut self, alloc: *mut Box, size: uint) -> *mut Box {
|
|
|
|
rtassert!(!alloc.is_null());
|
|
|
|
let orig_alloc = AllocHeader::from(alloc);
|
2013-10-26 03:10:39 -05:00
|
|
|
unsafe { (*orig_alloc).assert_sane(); }
|
|
|
|
|
|
|
|
let total_size = size + AllocHeader::size();
|
|
|
|
let alloc: *AllocHeader = unsafe {
|
2014-05-09 21:59:46 -05:00
|
|
|
libc_heap::realloc_raw(orig_alloc as *mut u8, total_size) as *AllocHeader
|
2013-10-26 03:10:39 -05:00
|
|
|
};
|
|
|
|
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 12:34:51 -05:00
|
|
|
let alloc: &mut AllocHeader = unsafe { mem::transmute(alloc) };
|
2013-10-26 03:10:39 -05:00
|
|
|
alloc.assert_sane();
|
|
|
|
alloc.update_size(size as u32);
|
|
|
|
self.update(alloc, orig_alloc as *AllocHeader);
|
2013-12-11 19:04:50 -06:00
|
|
|
return alloc.as_box();
|
2013-10-26 03:10:39 -05:00
|
|
|
}
|
|
|
|
|
2014-01-15 03:45:12 -06:00
|
|
|
#[inline]
|
2013-12-11 19:04:50 -06:00
|
|
|
fn free(&mut self, alloc: *mut Box) {
|
|
|
|
rtassert!(!alloc.is_null());
|
|
|
|
let alloc = AllocHeader::from(alloc);
|
2013-04-21 21:03:52 -05:00
|
|
|
unsafe {
|
2013-10-26 03:10:39 -05:00
|
|
|
(*alloc).assert_sane();
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 12:34:51 -05:00
|
|
|
self.release(mem::transmute(alloc));
|
2013-10-26 03:10:39 -05:00
|
|
|
rtassert!(self.live_allocations > 0);
|
|
|
|
self.live_allocations -= 1;
|
2014-05-06 21:03:14 -05:00
|
|
|
free(alloc as *mut c_void)
|
2013-10-26 03:10:39 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[cfg(rtdebug)]
|
|
|
|
fn claim(&mut self, alloc: &mut AllocHeader) {
|
|
|
|
alloc.assert_sane();
|
|
|
|
if TRACK_ALLOCATIONS > 1 {
|
|
|
|
alloc.index = self.allocations.len() as i32;
|
|
|
|
self.allocations.push(&*alloc as *AllocHeader);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#[cfg(not(rtdebug))]
|
2014-01-15 03:45:12 -06:00
|
|
|
#[inline]
|
2013-10-26 03:10:39 -05:00
|
|
|
fn claim(&mut self, _alloc: &mut AllocHeader) {}
|
|
|
|
|
|
|
|
#[cfg(rtdebug)]
|
|
|
|
fn release(&mut self, alloc: &AllocHeader) {
|
|
|
|
alloc.assert_sane();
|
|
|
|
if TRACK_ALLOCATIONS > 1 {
|
2014-02-10 16:41:57 -06:00
|
|
|
rtassert!(self.allocations.as_slice()[alloc.index] == alloc as *AllocHeader);
|
|
|
|
self.allocations.as_mut_slice()[alloc.index] = ptr::null();
|
2013-10-26 03:10:39 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#[cfg(not(rtdebug))]
|
2014-01-15 03:45:12 -06:00
|
|
|
#[inline]
|
2013-10-26 03:10:39 -05:00
|
|
|
fn release(&mut self, _alloc: &AllocHeader) {}
|
|
|
|
|
|
|
|
#[cfg(rtdebug)]
|
|
|
|
fn update(&mut self, alloc: &mut AllocHeader, orig: *AllocHeader) {
|
|
|
|
alloc.assert_sane();
|
|
|
|
if TRACK_ALLOCATIONS > 1 {
|
2014-02-10 16:41:57 -06:00
|
|
|
rtassert!(self.allocations.as_slice()[alloc.index] == orig);
|
|
|
|
self.allocations.as_mut_slice()[alloc.index] = &*alloc as *AllocHeader;
|
2013-10-26 03:10:39 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#[cfg(not(rtdebug))]
|
2014-01-15 03:45:12 -06:00
|
|
|
#[inline]
|
2013-10-26 03:10:39 -05:00
|
|
|
fn update(&mut self, _alloc: &mut AllocHeader, _orig: *AllocHeader) {}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Drop for MemoryRegion {
|
|
|
|
fn drop(&mut self) {
|
|
|
|
if self.live_allocations != 0 {
|
|
|
|
rtabort!("leaked managed memory ({} objects)", self.live_allocations);
|
2013-04-21 21:03:52 -05:00
|
|
|
}
|
2014-02-10 16:41:57 -06:00
|
|
|
rtassert!(self.allocations.as_slice().iter().all(|s| s.is_null()));
|
2013-04-21 21:03:52 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-16 22:16:23 -06:00
|
|
|
|
|
|
|
#[cfg(not(test))]
|
|
|
|
#[lang="malloc"]
|
|
|
|
#[inline]
|
|
|
|
pub unsafe fn local_malloc_(drop_glue: fn(*mut u8), size: uint, align: uint) -> *u8 {
|
|
|
|
local_malloc(drop_glue, size, align)
|
|
|
|
}
|
|
|
|
|
2014-01-15 03:45:12 -06:00
|
|
|
#[inline]
|
2014-02-05 22:05:30 -06:00
|
|
|
pub unsafe fn local_malloc(drop_glue: fn(*mut u8), size: uint, align: uint) -> *u8 {
|
|
|
|
// FIXME: Unsafe borrow for speed. Lame.
|
|
|
|
let task: Option<*mut Task> = Local::try_unsafe_borrow();
|
|
|
|
match task {
|
|
|
|
Some(task) => {
|
|
|
|
(*task).heap.alloc(drop_glue, size, align) as *u8
|
|
|
|
}
|
|
|
|
None => rtabort!("local malloc outside of task")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-16 22:16:23 -06:00
|
|
|
#[cfg(not(test))]
|
|
|
|
#[lang="free"]
|
|
|
|
#[inline]
|
|
|
|
pub unsafe fn local_free_(ptr: *u8) {
|
|
|
|
local_free(ptr)
|
|
|
|
}
|
|
|
|
|
|
|
|
// NB: Calls to free CANNOT be allowed to fail, as throwing an exception from
|
|
|
|
// inside a landing pad may corrupt the state of the exception handler. If a
|
|
|
|
// problem occurs, call exit instead.
|
2014-01-15 03:45:12 -06:00
|
|
|
#[inline]
|
2013-12-12 15:27:26 -06:00
|
|
|
pub unsafe fn local_free(ptr: *u8) {
|
2014-01-26 02:43:42 -06:00
|
|
|
// FIXME: Unsafe borrow for speed. Lame.
|
2013-08-08 13:38:10 -05:00
|
|
|
let task_ptr: Option<*mut Task> = Local::try_unsafe_borrow();
|
|
|
|
match task_ptr {
|
2013-08-12 21:09:46 -05:00
|
|
|
Some(task) => {
|
2013-10-26 03:10:39 -05:00
|
|
|
(*task).heap.free(ptr as *mut Box)
|
2013-08-12 21:09:46 -05:00
|
|
|
}
|
|
|
|
None => rtabort!("local free outside of task")
|
2013-06-22 03:09:06 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-10-26 03:10:39 -05:00
|
|
|
pub fn live_allocs() -> *mut Box {
|
2014-04-13 16:39:04 -05:00
|
|
|
Local::borrow(None::<Task>).heap.live_allocs
|
2013-04-21 21:03:52 -05:00
|
|
|
}
|
2013-07-22 13:42:47 -05:00
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod bench {
|
2014-02-13 19:49:11 -06:00
|
|
|
extern crate test;
|
2014-03-31 20:16:35 -05:00
|
|
|
use self::test::Bencher;
|
2013-07-22 13:42:47 -05:00
|
|
|
|
|
|
|
#[bench]
|
2014-03-31 20:16:35 -05:00
|
|
|
fn alloc_managed_small(b: &mut Bencher) {
|
|
|
|
b.iter(|| { @10; });
|
2013-07-22 13:42:47 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
#[bench]
|
2014-03-31 20:16:35 -05:00
|
|
|
fn alloc_managed_big(b: &mut Bencher) {
|
|
|
|
b.iter(|| { @([10, ..1000]); });
|
2013-07-22 13:42:47 -05:00
|
|
|
}
|
|
|
|
}
|