cessen/psychopath
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Forgot to remove extraneous println's from MemArena.

Browse Source 
Also updated MemArena documentation.
This commit is contained in:
Nathan Vegdahl 2017-04-10 00:50:51 -07:00
parent 0672db3a46
commit f46e72b0ca
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mem_arena/src/lib.rs
View File

@ -17,7 +17,8 @@ fn alignment_offset(addr: usize, alignment: usize) -> usize {
/// block. /// block.
/// ///
/// Additionally, to minimize unused space in blocks, allocations above a specified /// Additionally, to minimize unused space in blocks, allocations above a specified
/// size (the large allocation threshold) are given their own block. /// size (the large allocation threshold) are given their own block if they won't
/// fit in the remainder of the current block.
/// ///
/// The block size and large allocation threshold are configurable. /// The block size and large allocation threshold are configurable.
#[derive(Debug)] #[derive(Debug)]
@ -142,7 +143,6 @@ impl MemArena {
// If it will fit in the current block, use the current block. // If it will fit in the current block, use the current block.
if (start_index + size) <= blocks.first().unwrap().capacity() { if (start_index + size) <= blocks.first().unwrap().capacity() {
println!("In-Block, alloc size: {}", size);
blocks.first_mut().unwrap().set_len(start_index + size); blocks.first_mut().unwrap().set_len(start_index + size);
let block_ptr = blocks.first_mut().unwrap().as_mut_ptr(); let block_ptr = blocks.first_mut().unwrap().as_mut_ptr();
@ -152,7 +152,6 @@ impl MemArena {
else { else {
// If it's a "large allocation", give it its own memory block. // If it's a "large allocation", give it its own memory block.
if size > self.large_alloc_threshold { if size > self.large_alloc_threshold {
println!("Large Allocation, alloc size: {}", size);
blocks.push(Vec::with_capacity(size + alignment - 1)); blocks.push(Vec::with_capacity(size + alignment - 1));
blocks.last_mut().unwrap().set_len(size + alignment - 1); blocks.last_mut().unwrap().set_len(size + alignment - 1);
@ -164,7 +163,6 @@ impl MemArena {
} }
// Otherwise create a new shared block. // Otherwise create a new shared block.
else { else {
println!("New Block, alloc size: {}", size);
blocks.push(Vec::with_capacity(self.block_size)); blocks.push(Vec::with_capacity(self.block_size));
let block_count = blocks.len(); let block_count = blocks.len();
blocks.swap(0, block_count - 1); blocks.swap(0, block_count - 1);