Skip to content

make dict iterator use atomic operation #2927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 2 commits into from
Aug 22, 2021
Merged

make dict iterator use atomic operation #2927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6cd761
make dict iterator use atomic operation
eldpswp99 Aug 22, 2021
19ce637
change function name to represent atomic function
eldpswp99 Aug 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions vm/src/builtins/dict.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,12 +718,8 @@ macro_rules! dict_iterator {
"dictionary changed size during iteration".to_owned(),
));
}
let mut position = zelf.position.load();
match zelf.dict.entries.next_entry(&mut position) {
Some((key, value)) => {
zelf.position.store(position);
Ok(($result_fn)(vm, key, value))
}
match zelf.dict.entries.next_entry_atomic(&zelf.position) {
Comment thread
youknowone marked this conversation as resolved.
Some((key, value)) => Ok(($result_fn)(vm, key, value)),
None => {
zelf.status.store(IterStatus::Exhausted);
Err(vm.new_stop_iteration())
Expand Down Expand Up @@ -782,7 +778,7 @@ macro_rules! dict_iterator {
"dictionary changed size during iteration".to_owned(),
));
}
match zelf.dict.entries.next_entry_reversed(&zelf.position) {
match zelf.dict.entries.next_entry_atomic_reversed(&zelf.position) {
Comment thread
youknowone marked this conversation as resolved.
Some((key, value)) => Ok(($result_fn)(vm, key, value)),
None => {
zelf.status.store(IterStatus::Exhausted);
Expand Down
16 changes: 15 additions & 1 deletion vm/src/dictdatatype.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,21 @@ impl<T: Clone> Dict<T> {
}
}

pub fn next_entry_reversed(&self, position: &AtomicCell<usize>) -> Option<(PyObjectRef, T)> {
pub fn next_entry_atomic(&self, position: &AtomicCell<usize>) -> Option<(PyObjectRef, T)> {
Comment thread
youknowone marked this conversation as resolved.
let inner = self.read();
loop {
let position_usize = position.fetch_add(1);
let entry = inner.entries.get(position_usize)?;
if let Some(entry) = entry {
break Some((entry.key.clone(), entry.value.clone()));
}
}
}

pub fn next_entry_atomic_reversed(
Comment thread
youknowone marked this conversation as resolved.
&self,
position: &AtomicCell<usize>,
) -> Option<(PyObjectRef, T)> {
let inner = self.read();
loop {
let position_usize = position.fetch_add(1);
Expand Down