OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make wait_many work on selectable types instead.

Browse Source 
This should avoid allocation in many select paths.
This commit is contained in:
Eric Holk 2012-08-14 16:28:23 -07:00
parent b206920d9d
commit 942649a260
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/libcore/pipes.rs
View File

@ -581,14 +581,14 @@ that vector. The index points to an endpoint that has either been
closed by the sender or has a message waiting to be received. closed by the sender or has a message waiting to be received.
*/ */
fn wait_many(pkts: &[*packet_header]) -> uint { fn wait_many<T: selectable>(pkts: &[T]) -> uint {
let this = rustrt::rust_get_task(); let this = rustrt::rust_get_task();
rustrt::task_clear_event_reject(this); rustrt::task_clear_event_reject(this);
let mut data_avail = false; let mut data_avail = false;
let mut ready_packet = pkts.len(); let mut ready_packet = pkts.len();
for pkts.eachi |i, p| unsafe { for pkts.eachi |i, p| unsafe {
let p = unsafe { &*p }; let p = unsafe { &*p.header() };
let old = p.mark_blocked(this); let old = p.mark_blocked(this);
match old { match old {
full | terminated => { full | terminated => {
@ -605,7 +605,7 @@ fn wait_many(pkts: &[*packet_header]) -> uint {
while !data_avail { while !data_avail {
debug!{"sleeping on %? packets", pkts.len()}; debug!{"sleeping on %? packets", pkts.len()};
let event = wait_event(this) as *packet_header; let event = wait_event(this) as *packet_header;
let pos = vec::position(pkts, |p| p == event); let pos = vec::position(pkts, |p| p.header() == event);
match pos { match pos {
some(i) => { some(i) => {
@ -618,13 +618,13 @@ fn wait_many(pkts: &[*packet_header]) -> uint {
debug!{"%?", pkts[ready_packet]}; debug!{"%?", pkts[ready_packet]};
for pkts.each |p| { unsafe{ (*p).unblock()} } for pkts.each |p| { unsafe{ (*p.header()).unblock()} }
debug!("%?, %?", ready_packet, pkts[ready_packet]); debug!("%?, %?", ready_packet, pkts[ready_packet]);
unsafe { unsafe {
assert (*pkts[ready_packet]).state == full assert (*pkts[ready_packet].header()).state == full
|| (*pkts[ready_packet]).state == terminated; || (*pkts[ready_packet].header()).state == terminated;
} }
ready_packet ready_packet
@ -686,7 +686,7 @@ impl *packet_header: selectable {
/// Returns the index of an endpoint that is ready to receive. /// Returns the index of an endpoint that is ready to receive.
fn selecti<T: selectable>(endpoints: &[T]) -> uint { fn selecti<T: selectable>(endpoints: &[T]) -> uint {
wait_many(endpoints.map(|p| p.header())) wait_many(endpoints)
} }
/// Returns 0 or 1 depending on which endpoint is ready to receive /// Returns 0 or 1 depending on which endpoint is ready to receive