-
Notifications
You must be signed in to change notification settings - Fork 12.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
auto merge of #6626 : brson/rust/io-upstream, r=graydon
r? Mostly refactoring, and adding some of the remaining types described in #4419. The [`Local`](https://github.com/brson/rust/blob/3b4ff41511cfaa5e311b03d16b47bf40c117fa2f/src/libcore/rt/local.rs#L17) trait collects some common, often unsafe patterns around task-local and thread-local values. Making all these types safe is largely the aim of #6210.
- Loading branch information
Showing
20 changed files
with
466 additions
and
321 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| // 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 option::{Option, Some, None}; | ||
| use rt::sched::Scheduler; | ||
| use rt::task::Task; | ||
| use rt::local_ptr; | ||
| use rt::rtio::{EventLoop, IoFactoryObject}; | ||
|
|
||
| pub trait Local { | ||
| fn put(value: ~Self); | ||
| fn take() -> ~Self; | ||
| fn exists() -> bool; | ||
| fn borrow(f: &fn(&mut Self)); | ||
| unsafe fn unsafe_borrow() -> *mut Self; | ||
| unsafe fn try_unsafe_borrow() -> Option<*mut Self>; | ||
| } | ||
|
|
||
| impl Local for Scheduler { | ||
| fn put(value: ~Scheduler) { unsafe { local_ptr::put(value) }} | ||
| fn take() -> ~Scheduler { unsafe { local_ptr::take() } } | ||
| fn exists() -> bool { local_ptr::exists() } | ||
| fn borrow(f: &fn(&mut Scheduler)) { unsafe { local_ptr::borrow(f) } } | ||
| unsafe fn unsafe_borrow() -> *mut Scheduler { local_ptr::unsafe_borrow() } | ||
| unsafe fn try_unsafe_borrow() -> Option<*mut Scheduler> { abort!("unimpl") } | ||
| } | ||
|
|
||
| impl Local for Task { | ||
| fn put(value: ~Task) { abort!("unimpl") } | ||
| fn take() -> ~Task { abort!("unimpl") } | ||
| fn exists() -> bool { abort!("unimpl") } | ||
| fn borrow(f: &fn(&mut Task)) { | ||
| do Local::borrow::<Scheduler> |sched| { | ||
| match sched.current_task { | ||
| Some(~ref mut task) => { | ||
| f(&mut *task.task) | ||
| } | ||
| None => { | ||
| abort!("no scheduler") | ||
| } | ||
| } | ||
| } | ||
| } | ||
| unsafe fn unsafe_borrow() -> *mut Task { | ||
| match (*Local::unsafe_borrow::<Scheduler>()).current_task { | ||
| Some(~ref mut task) => { | ||
| let s: *mut Task = &mut *task.task; | ||
| return s; | ||
| } | ||
| None => { | ||
| // Don't fail. Infinite recursion | ||
| abort!("no scheduler") | ||
| } | ||
| } | ||
| } | ||
| unsafe fn try_unsafe_borrow() -> Option<*mut Task> { | ||
| if Local::exists::<Scheduler>() { | ||
| Some(Local::unsafe_borrow()) | ||
| } else { | ||
| None | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // XXX: This formulation won't work once ~IoFactoryObject is a real trait pointer | ||
| impl Local for IoFactoryObject { | ||
| fn put(value: ~IoFactoryObject) { abort!("unimpl") } | ||
| fn take() -> ~IoFactoryObject { abort!("unimpl") } | ||
| fn exists() -> bool { abort!("unimpl") } | ||
| fn borrow(f: &fn(&mut IoFactoryObject)) { abort!("unimpl") } | ||
| unsafe fn unsafe_borrow() -> *mut IoFactoryObject { | ||
| let sched = Local::unsafe_borrow::<Scheduler>(); | ||
| let io: *mut IoFactoryObject = (*sched).event_loop.io().unwrap(); | ||
| return io; | ||
| } | ||
| unsafe fn try_unsafe_borrow() -> Option<*mut IoFactoryObject> { abort!("unimpl") } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod test { | ||
| use rt::sched::Scheduler; | ||
| use rt::uv::uvio::UvEventLoop; | ||
| use super::*; | ||
|
|
||
| #[test] | ||
| fn thread_local_scheduler_smoke_test() { | ||
| let scheduler = ~UvEventLoop::new_scheduler(); | ||
| Local::put(scheduler); | ||
| let _scheduler: ~Scheduler = Local::take(); | ||
| } | ||
|
|
||
| #[test] | ||
| fn thread_local_scheduler_two_instances() { | ||
| let scheduler = ~UvEventLoop::new_scheduler(); | ||
| Local::put(scheduler); | ||
| let _scheduler: ~Scheduler = Local::take(); | ||
| let scheduler = ~UvEventLoop::new_scheduler(); | ||
| Local::put(scheduler); | ||
| let _scheduler: ~Scheduler = Local::take(); | ||
| } | ||
|
|
||
| #[test] | ||
| fn borrow_smoke_test() { | ||
| let scheduler = ~UvEventLoop::new_scheduler(); | ||
| Local::put(scheduler); | ||
| unsafe { | ||
| let _scheduler: *mut Scheduler = Local::unsafe_borrow(); | ||
| } | ||
| let _scheduler: ~Scheduler = Local::take(); | ||
| } | ||
| } |
Oops, something went wrong.