meli
/
wasm-demo
4
Fork 0
Code Issues Pull Requests Releases Wiki Activity

melib/thread/iterators: remove recursion in favor of loops

master
Manos Pitsidianakis 2020-07-17 11:45:11 +03:00
parent b4dadf20b6
commit c6c2865a54
Signed by: Manos Pitsidianakis
GPG Key ID: 73627C2F690DF710
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
melib/src/thread/iterators.rs
View File

@ -46,8 +46,8 @@ pub struct ThreadsGroupIterator<'a> {
} }
impl<'a> Iterator for ThreadsGroupIterator<'a> { impl<'a> Iterator for ThreadsGroupIterator<'a> {
type Item = (usize, ThreadNodeHash, bool); type Item = (usize, ThreadNodeHash, bool);
fn next(&mut self) -> Option<(usize, ThreadNodeHash, bool)> { fn next(&mut self) -> Option<Self::Item> {
{ loop {
let mut tree = &(*self.root_tree); let mut tree = &(*self.root_tree);
for i in self.stack.iter() { for i in self.stack.iter() {
tree = &self.thread_nodes[&tree[*i]].children; tree = &self.thread_nodes[&tree[*i]].children;
@ -71,7 +71,7 @@ impl<'a> Iterator for ThreadsGroupIterator<'a> {
if self.thread_nodes[&ret.1].message.is_some() { if self.thread_nodes[&ret.1].message.is_some() {
return Some(ret); return Some(ret);
} else { } else {
return self.next(); continue;
} }
} }
self.pos += 1; self.pos += 1;
@ -80,7 +80,6 @@ impl<'a> Iterator for ThreadsGroupIterator<'a> {
} }
} }
} }
self.next()
} }
} }
/* `ThreadIterator` returns messages of a specific thread according to the sorted order. For example, for the following /* `ThreadIterator` returns messages of a specific thread according to the sorted order. For example, for the following
@ -106,7 +105,7 @@ pub struct ThreadGroupIterator<'a> {
impl<'a> Iterator for ThreadGroupIterator<'a> { impl<'a> Iterator for ThreadGroupIterator<'a> {
type Item = (usize, ThreadNodeHash); type Item = (usize, ThreadNodeHash);
fn next(&mut self) -> Option<(usize, ThreadNodeHash)> { fn next(&mut self) -> Option<(usize, ThreadNodeHash)> {
{ loop {
let mut tree = &[self.group][..]; let mut tree = &[self.group][..];
for i in self.stack.iter() { for i in self.stack.iter() {
tree = self.thread_nodes[&tree[*i]].children.as_slice(); tree = self.thread_nodes[&tree[*i]].children.as_slice();
@ -125,7 +124,7 @@ impl<'a> Iterator for ThreadGroupIterator<'a> {
if self.thread_nodes[&ret.1].message.is_some() { if self.thread_nodes[&ret.1].message.is_some() {
return Some(ret); return Some(ret);
} else { } else {
return self.next(); continue;
} }
} }
self.pos += 1; self.pos += 1;
@ -134,6 +133,5 @@ impl<'a> Iterator for ThreadGroupIterator<'a> {
} }
} }
} }
self.next()
} }
} }