bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Manually reset the ringbuffer before or after the ringbuffer push/pop tests.

Browse source
This commit is contained in:
Colin Sherratt 2014-11-10 21:57:52 -05:00
parent 4cae9add8c
commit 5e549d8c3c
1 changed files with 25 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/libcollections/ring_buf.rs
View file

@ -209,7 +209,7 @@ impl<T> RingBuf<T> {
assert!(i < self.len()); assert!(i < self.len());
assert!(j < self.len()); assert!(j < self.len());
let ri = wrap_index(self.tail + i, self.cap); let ri = wrap_index(self.tail + i, self.cap);
let rj = wrap_index(self.tail + j, self.cap);; let rj = wrap_index(self.tail + j, self.cap);
unsafe { unsafe {
ptr::swap(self.ptr.offset(ri as int), self.ptr.offset(rj as int)) ptr::swap(self.ptr.offset(ri as int), self.ptr.offset(rj as int))
} }
@ -972,53 +972,58 @@ mod tests {
#[bench] #[bench]
fn bench_new(b: &mut test::Bencher) { fn bench_new(b: &mut test::Bencher) {
b.iter(|| { b.iter(|| {
let _: RingBuf<u64> = RingBuf::new(); let ring: RingBuf<u64> = RingBuf::new();
test::black_box(ring);
}) })
} }
#[bench] #[bench]
fn bench_push_back_100(b: &mut test::Bencher) { fn bench_push_back_100(b: &mut test::Bencher) {
let mut deq = RingBuf::with_capacity(100); let mut deq = RingBuf::with_capacity(101);
b.iter(|| { b.iter(|| {
for i in range(0i, 100) { for i in range(0i, 100) {
deq.push_back(i); deq.push_back(i);
} }
deq.clear(); deq.head = 0;
deq.tail = 0;
}) })
} }
#[bench] #[bench]
fn bench_push_front_100(b: &mut test::Bencher) { fn bench_push_front_100(b: &mut test::Bencher) {
let mut deq = RingBuf::with_capacity(100); let mut deq = RingBuf::with_capacity(101);
b.iter(|| { b.iter(|| {
for i in range(0i, 100) { for i in range(0i, 100) {
deq.push_front(i); deq.push_front(i);
} }
deq.clear(); deq.head = 0;
deq.tail = 0;
}) })
} }
#[bench] #[bench]
fn bench_pop_100(b: &mut test::Bencher) { fn bench_pop_back_100(b: &mut test::Bencher) {
let mut deq = RingBuf::with_capacity(100); let mut deq: RingBuf<int> = RingBuf::with_capacity(101);
b.iter(|| { b.iter(|| {
for i in range(0i, 100) { deq.head = 100;
deq.push_back(i); deq.tail = 0;
while !deq.is_empty() {
test::black_box(deq.pop_back());
} }
while None != deq.pop_back() {}
}) })
} }
#[bench] #[bench]
fn bench_pop_front_100(b: &mut test::Bencher) { fn bench_pop_front_100(b: &mut test::Bencher) {
let mut deq = RingBuf::with_capacity(100); let mut deq: RingBuf<int> = RingBuf::with_capacity(101);
b.iter(|| { b.iter(|| {
for i in range(0i, 100) { deq.head = 100;
deq.push_back(i); deq.tail = 0;
while !deq.is_empty() {
test::black_box(deq.pop_front());
} }
while None != deq.pop_front() {}
}) })
} }
@ -1029,6 +1034,7 @@ mod tests {
for i in range(0i, 1025) { for i in range(0i, 1025) {
deq.push_front(i); deq.push_front(i);
} }
test::black_box(deq);
}) })
} }
@ -1041,7 +1047,7 @@ mod tests {
for &i in ring.iter() { for &i in ring.iter() {
sum += i; sum += i;
} }
sum test::black_box(sum);
}) })
} }
@ -1050,9 +1056,11 @@ mod tests {
let mut ring: RingBuf<int> = range(0i, 1000).collect(); let mut ring: RingBuf<int> = range(0i, 1000).collect();
b.iter(|| { b.iter(|| {
let mut sum = 0;
for i in ring.iter_mut() { for i in ring.iter_mut() {
*i += 1; sum += *i;
} }
test::black_box(sum);
}) })
} }