-
Notifications
You must be signed in to change notification settings - Fork 335
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.
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
Improve entity size stats: include whole subtree #4542
Merged
Merged
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
926ae4d
Fix typo in `EntityStats`
emilk 69daf54
Remove warning color from something that is totally fine
emilk f5dac9b
Add book-keeping of number of bytes used by an entity sub-tree
emilk f5d132f
When hovering an entity in the stream view, show total data for subtree
emilk 6052675
fix typos
emilk 5209286
More accurate docstring, and use total_size_bytes
emilk File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -88,22 +88,47 @@ pub struct SubtreeInfo { | |
/// | ||
/// ⚠ Auto-generated instance keys are _not_ accounted for. ⚠ | ||
pub time_histogram: TimeHistogramPerTimeline, | ||
|
||
/// Number of bytes used by all arrow data in this tree (ignores overhead from book-keeping, schemas, etc). | ||
data_bytes: u64, | ||
} | ||
|
||
impl SubtreeInfo { | ||
/// Assumes the event has been filtered to be part of this subtree. | ||
fn on_event(&mut self, event: &StoreEvent) { | ||
use re_types_core::SizeBytes as _; | ||
|
||
match event.kind { | ||
StoreDiffKind::Addition => { | ||
self.time_histogram | ||
.add(&event.times, event.num_components() as _); | ||
|
||
for cell in event.cells.values() { | ||
self.data_bytes += cell.heap_size_bytes(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The cells themselves are also stored on the heap at this point, so you want |
||
} | ||
} | ||
StoreDiffKind::Deletion => { | ||
self.time_histogram | ||
.remove(&event.timepoint(), event.num_components() as _); | ||
|
||
for cell in event.cells.values() { | ||
if let Some(bytes_left) = self.data_bytes.checked_sub(cell.heap_size_bytes()) { | ||
self.data_bytes = bytes_left; | ||
} else if cfg!(debug_assertions) { | ||
re_log::warn_once!( | ||
"Error in book-keeping: we've removed more bytes then we've added" | ||
); | ||
} | ||
} | ||
} | ||
} | ||
} | ||
|
||
/// Number of bytes used by all arrow data in this tree (ignores overhead from book-keeping, schemas, etc). | ||
#[inline] | ||
pub fn data_bytes(&self) -> u64 { | ||
self.data_bytes | ||
} | ||
} | ||
|
||
/// Maintains an optimized representation of a batch of [`StoreEvent`]s specifically designed to | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The size of the cell does take into account the copy of the arrow schema that is stored in the cell