FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Add some extra profiling trace points. by windelbouwman · Pull Request #1169 · RustPython/RustPython · GitHub

  1. RustPython
  2. RustPython

Repository navigation

Add some extra profiling trace points. #1169

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
coolreader18 merged 6 commits into from
Jul 24, 2019
Conversation 2 Commits 6 Checks 0 Files changed
Merged

Add some extra profiling trace points. #1169

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
25816a2
Add some extra profiling trace points.
windelbouwman Jul 23, 2019
f7320cf
Move Scope struct to its own file, making the frame module private in…
windelbouwman Jul 23, 2019
e138a73
Move get_item_option to PyDictRef struct.
windelbouwman Jul 23, 2019
f994b05
Move get_item_option back into ItemProtocol
windelbouwman Jul 23, 2019
05ea701
Cleanup frame file.
windelbouwman Jul 24, 2019
881baf6
Update flame trace names.
windelbouwman Jul 24, 2019
File filter

Filter by extension

Filter by extension .rs  (3) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
Prev Previous commit
Next Next commit
Move get_item_option back into ItemProtocol
  • Loading branch information
windelbouwman committed Jul 23, 2019
commit f994b0580fbcf2c7ed34e5aa3d16f8a095eb70ea
19 changes: 0 additions & 19 deletions vm/src/obj/objdict.rs
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ use super::objbool;
use super::objiter;
use super::objstr;
use crate::dictdatatype;
use crate::obj::objtype;
use crate::obj::objtype::PyClassRef;
use crate::pyobject::PyClassImpl;

Expand Down Expand Up @@ -215,24 +214,6 @@ impl PyDictRef {
Err(vm.new_key_error(key.clone()))
}

#[cfg_attr(feature = "flame-it", flame("PyDictRef"))]
pub fn get_item_option<T: IntoPyObject>(
&self,
key: T,
vm: &VirtualMachine,
) -> PyResult<Option<PyObjectRef>> {
match self.clone().inner_getitem(key.into_pyobject(vm)?, vm) {
Ok(value) => Ok(Some(value)),
Err(exc) => {
if objtype::isinstance(&exc, &vm.ctx.exceptions.key_error) {
Ok(None)
} else {
Err(exc)
}
}
}
}

fn get(
self,
key: PyObjectRef,
Expand Down
2 changes: 1 addition & 1 deletion vm/src/obj/objsuper.rs
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use crate::obj::objfunction::PyMethod;
use crate::obj::objstr;
use crate::obj::objtype::{PyClass, PyClassRef};
use crate::pyobject::{
PyContext, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject, TypeProtocol,
ItemProtocol, PyContext, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject, TypeProtocol,
};
use crate::scope::NameProtocol;
use crate::vm::VirtualMachine;
Expand Down
18 changes: 18 additions & 0 deletions vm/src/pyobject.rs
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -1021,6 +1021,24 @@ pub trait ItemProtocol {
vm: &VirtualMachine,
) -> PyResult;
fn del_item<T: IntoPyObject>(&self, key: T, vm: &VirtualMachine) -> PyResult;

coolreader18 Jul 24, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

This should probably be flame("ItemProtocol")?

#[cfg_attr(feature = "flame-it", flame("PyDictRef"))]
fn get_item_option<T: IntoPyObject>(
&self,
key: T,
vm: &VirtualMachine,
) -> PyResult<Option<PyObjectRef>> {
match self.get_item(key, vm) {
Ok(value) => Ok(Some(value)),
Err(exc) => {
if objtype::isinstance(&exc, &vm.ctx.exceptions.key_error) {
Ok(None)
} else {
Err(exc)
}
}
}
}
}

impl ItemProtocol for PyObjectRef {
Expand Down
Back | FazBrowse Home | New Git URL