Skip to content

Commit 40ce0b7

Browse files
author
blake2-ppc
committed
deque: Speed up deque growth by a lot
Fix some issues with the deque being very slow, keep the same vec around instead of constructing a new. Move as few elements as possible, so the self.lo point is not moved after grow. [o o o o o|o o o] hi...^ ^.... lo grows to [. . . . .|o o o o o o o o|. . .] ^.. lo ^.. hi If the deque is append-only, it will result in moving no elements on grow. If the deque is prepend-only, all will be moved each time. The bench tests added show big improvements: Timed using `rust build -O --test extra.rs && ./extra --bench deque` Old version: test deque::tests::bench_add_back ... bench: 4976 ns/iter (+/- 9) test deque::tests::bench_add_front ... bench: 4108 ns/iter (+/- 18) test deque::tests::bench_grow ... bench: 416964 ns/iter (+/- 4197) test deque::tests::bench_new ... bench: 408 ns/iter (+/- 12) With this commit: test deque::tests::bench_add_back ... bench: 12 ns/iter (+/- 0) test deque::tests::bench_add_front ... bench: 16 ns/iter (+/- 0) test deque::tests::bench_grow ... bench: 1515 ns/iter (+/- 30) test deque::tests::bench_new ... bench: 419 ns/iter (+/- 3)
1 parent 81933ed commit 40ce0b7

File tree

1 file changed

+20
-17
lines changed

1 file changed

+20
-17
lines changed

src/libextra/deque.rs

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
//! A double-ended queue implemented as a circular buffer
1212
1313
use std::uint;
14-
use std::util::replace;
1514
use std::vec;
1615
use std::cast::transmute;
1716

@@ -103,28 +102,28 @@ impl<T> Deque<T> {
103102

104103
/// Prepend an element to the deque
105104
pub fn add_front(&mut self, t: T) {
106-
let oldlo = self.lo;
105+
if self.nelts == self.elts.len() {
106+
grow(self.nelts, self.lo, &mut self.elts);
107+
self.hi = self.lo + self.nelts;
108+
}
107109
if self.lo == 0u {
108110
self.lo = self.elts.len() - 1u;
109111
} else { self.lo -= 1u; }
110-
if self.nelts == self.elts.len() {
111-
self.elts = grow(self.nelts, oldlo, self.elts);
112-
self.lo = self.elts.len() - 1u;
113-
self.hi = self.nelts;
114-
}
115112
self.elts[self.lo] = Some(t);
116113
self.nelts += 1u;
117114
}
118115

119116
/// Append an element to the deque
120117
pub fn add_back(&mut self, t: T) {
121118
if self.lo == self.hi && self.nelts != 0u {
122-
self.elts = grow(self.nelts, self.lo, self.elts);
123-
self.lo = 0u;
124-
self.hi = self.nelts;
119+
grow(self.nelts, self.lo, &mut self.elts);
120+
self.hi = self.lo + self.nelts;
125121
}
126122
self.elts[self.hi] = Some(t);
127-
self.hi = (self.hi + 1u) % self.elts.len();
123+
self.hi += 1;
124+
if self.hi == self.elts.len() {
125+
self.hi = 0;
126+
}
128127
self.nelts += 1u;
129128
}
130129

@@ -235,15 +234,19 @@ iterator!{impl DequeMutRevIterator -> &'self mut T, -1}
235234

236235
/// Grow is only called on full elts, so nelts is also len(elts), unlike
237236
/// elsewhere.
238-
fn grow<T>(nelts: uint, lo: uint, elts: &mut [Option<T>]) -> ~[Option<T>] {
237+
fn grow<T>(nelts: uint, lo: uint, elts: &mut ~[Option<T>]) {
239238
assert_eq!(nelts, elts.len());
240-
let mut rv = ~[];
239+
let newlen = elts.capacity() * 2;
240+
elts.reserve(newlen);
241241

242-
do rv.grow_fn(nelts + 1) |i| {
243-
replace(&mut elts[(lo + i) % nelts], None)
242+
/* fill with None */
243+
for uint::range(elts.len(), elts.capacity()) |_| {
244+
elts.push(None);
245+
}
246+
/* move the former wraparound to the new half */
247+
for uint::range(0, lo) |i| {
248+
elts.swap(i, nelts + i);
244249
}
245-
246-
rv
247250
}
248251

249252
fn get<'r, T>(elts: &'r [Option<T>], i: uint) -> &'r T {

0 commit comments

Comments
 (0)