Skip to content
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 by Bors] - [profiler] Cache StringId #2495

Closed
wants to merge 3 commits into from
Closed

[Merged by Bors] - [profiler] Cache StringId #2495

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
804d2ae
[profiler] Cache StringId
tunz Dec 20, 2022
f91468f
Fix clippy
tunz Dec 20, 2022
d0e0686
Use expect
tunz Dec 21, 2022
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
Prev Previous commit
Use expect
  • Loading branch information
@tunz
tunz committed Dec 21, 2022
commit d0e0686a5f7656dd3ef5decad606ed65976ec825
12 changes: 9 additions & 3 deletions boa_profiler/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
//! [boa-web]: https://boa-dev.github.io/
//! [boa-playground]: https://boa-dev.github.io/boa/playground/

#![cfg_attr(not(any(test, feature = "profiler")), forbid(clippy::unwrap_used))]
#![cfg_attr(not(test), forbid(clippy::unwrap_used))]
#![warn(missing_docs, clippy::dbg_macro)]
#![deny(
// rustc lint groups https://doc.rust-lang.org/rustc/lints/groups.html
Expand Down Expand Up @@ -122,12 +122,18 @@ impl Profiler {
fn get_or_alloc_string(&self, s: &str) -> StringId {
{
// Check the cache only with the read lock first.
let cache = self.string_cache.read().unwrap();
let cache = self
.string_cache
.read()
.expect("Some writer panicked while holding an exclusive lock.");
if let Some(id) = cache.get(s) {
return *id;
}
}
let mut cache = self.string_cache.write().unwrap();
let mut cache = self
.string_cache
.write()
.expect("Some writer panicked while holding an exclusive lock.");
let entry = cache.entry(s.into());
match entry {
Entry::Occupied(entry) => *entry.get(),
Expand Down