Skip to content

Commit

Permalink
allocator: add implementation of new Alloc trait
Browse files Browse the repository at this point in the history
The Alloc trait for allocators was added in Rust nightly 2017/06/21
(from rust-lang/rust#42313). With the addition of allowing a global
allocator to be specified (pending in rust-lang/rust#42727) this will
obviate the need for the alloc_uefi crate.
  • Loading branch information
csssuf committed Jun 21, 2017
1 parent 4b70566 commit f0d3def
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 0 deletions.
36 changes: 36 additions & 0 deletions src/allocator.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
// Copyright 2017 CoreOS, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

use alloc::allocator::*;

use base::Status;

/// Rust Allocator utilizing the EFI {allocate, free}_pool functions.
struct EfiAllocator {}

unsafe impl<'a> Alloc for &'a EfiAllocator {
unsafe fn alloc(&mut self, layout: Layout) -> Result<*mut u8, AllocErr> {
::get_system_table()
.boot_services()
.allocate_pool(layout.size())
.map_err(|e| match e {
Status::OutOfResources => AllocErr::Exhausted { request: layout },
x => AllocErr::Unsupported { details: x.str() },
})
}

unsafe fn dealloc(&mut self, ptr: *mut u8, _layout: Layout) {
::get_system_table().boot_services().free_pool(ptr);
}
}
5 changes: 5 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#![allow(dead_code)]
#![feature(alloc)]
#![feature(allocator_api)]
#![no_std]

extern crate alloc;

pub mod protocol;
mod void;
mod base;
Expand All @@ -12,6 +16,7 @@ mod runtimeservices;
mod console;
mod task;
mod event;
mod allocator;


pub use base::{Handle, Handles, Event, MemoryType, Status, Time};
Expand Down

0 comments on commit f0d3def

Please sign in to comment.