diff options
| author | bors <bors@rust-lang.org> | 2013-12-26 01:01:54 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-12-26 01:01:54 -0800 |
| commit | 9477c49a7b4eec2c2a3e0d9a28c4129e3d1fa6ec (patch) | |
| tree | bd57f2b50c352a4a63d0ae75ef52419e19ebf994 /src/libstd/rt/stack.rs | |
| parent | d975060de6c944ca12ce5205fbc9fc7726948ae1 (diff) | |
| parent | 6cad8f4f14da1dd529100779db74b03d6db20faf (diff) | |
| download | rust-9477c49a7b4eec2c2a3e0d9a28c4129e3d1fa6ec.tar.gz rust-9477c49a7b4eec2c2a3e0d9a28c4129e3d1fa6ec.zip | |
auto merge of #10965 : alexcrichton/rust/libgreen, r=brson
This pull request extracts all scheduling functionality from libstd, moving it into its own separate crates. The new libnative and libgreen will be the new way in which 1:1 and M:N scheduling is implemented. The standard library still requires an interface to the runtime, however, (think of things like `std::comm` and `io::println`). The interface is now defined by the `Runtime` trait inside of `std::rt`. The booting process is now that libgreen defines the start lang-item and that's it. I want to extend this soon to have libnative also have a "start lang item" but also allow libgreen and libnative to be linked together in the same process. For now though, only libgreen can be used to start a program (unless you define the start lang item yourself). Again though, I want to change this soon, I just figured that this pull request is large enough as-is. This certainly wasn't a smooth transition, certain functionality has no equivalent in this new separation, and some functionality is now better enabled through this new system. I did my best to separate all of the commits by topic and keep things fairly bite-sized, although are indeed larger than others. As a note, this is currently rebased on top of my `std::comm` rewrite (or at least an old copy of it), but none of those commits need reviewing (that will all happen in another pull request).
Diffstat (limited to 'src/libstd/rt/stack.rs')
| -rw-r--r-- | src/libstd/rt/stack.rs | 78 |
1 files changed, 0 insertions, 78 deletions
diff --git a/src/libstd/rt/stack.rs b/src/libstd/rt/stack.rs deleted file mode 100644 index 44b60e955d2..00000000000 --- a/src/libstd/rt/stack.rs +++ /dev/null @@ -1,78 +0,0 @@ -// 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. - -use container::Container; -use ptr::RawPtr; -use vec; -use ops::Drop; -use libc::{c_uint, uintptr_t}; - -pub struct StackSegment { - priv buf: ~[u8], - priv valgrind_id: c_uint -} - -impl StackSegment { - pub fn new(size: uint) -> StackSegment { - unsafe { - // Crate a block of uninitialized values - let mut stack = vec::with_capacity(size); - stack.set_len(size); - - let mut stk = StackSegment { - buf: stack, - valgrind_id: 0 - }; - - // XXX: Using the FFI to call a C macro. Slow - stk.valgrind_id = rust_valgrind_stack_register(stk.start(), stk.end()); - return stk; - } - } - - /// Point to the low end of the allocated stack - pub fn start(&self) -> *uint { - self.buf.as_ptr() as *uint - } - - /// Point one word beyond the high end of the allocated stack - pub fn end(&self) -> *uint { - unsafe { - self.buf.as_ptr().offset(self.buf.len() as int) as *uint - } - } -} - -impl Drop for StackSegment { - fn drop(&mut self) { - unsafe { - // XXX: Using the FFI to call a C macro. Slow - rust_valgrind_stack_deregister(self.valgrind_id); - } - } -} - -pub struct StackPool(()); - -impl StackPool { - pub fn new() -> StackPool { StackPool(()) } - - fn take_segment(&self, min_size: uint) -> StackSegment { - StackSegment::new(min_size) - } - - fn give_segment(&self, _stack: StackSegment) { - } -} - -extern { - fn rust_valgrind_stack_register(start: *uintptr_t, end: *uintptr_t) -> c_uint; - fn rust_valgrind_stack_deregister(id: c_uint); -} |
