Skip to content

global module registry: switch from Mutex to RwLock #2947

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
pchickey merged 1 commit into from
Jun 3, 2021
+6 −9
Merged

global module registry: switch from Mutex to RwLock #2947

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 6 additions & 9 deletions crates/wasmtime/src/module/registry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use crate::{signatures::SignatureCollection, Module};
use std::{
collections::BTreeMap,
sync::{Arc, Mutex},
sync::{Arc, RwLock},
};
use wasmtime_environ::{
entity::EntityRef,
Expand All @@ -15,7 +15,7 @@ use wasmtime_jit::CompiledModule;
use wasmtime_runtime::{ModuleInfo, VMCallerCheckedAnyfunc, VMTrampoline};

lazy_static::lazy_static! {
static ref GLOBAL_MODULES: Mutex<GlobalModuleRegistry> = Default::default();
static ref GLOBAL_MODULES: RwLock<GlobalModuleRegistry> = Default::default();
}

fn func_by_pc(module: &CompiledModule, pc: usize) -> Option<(DefinedFuncIndex, u32)> {
Expand Down Expand Up @@ -88,7 +88,7 @@ impl ModuleRegistry {
);
assert!(prev.is_none());

GLOBAL_MODULES.lock().unwrap().register(start, end, module);
GLOBAL_MODULES.write().unwrap().register(start, end, module);
}

/// Looks up a trampoline from an anyfunc.
Expand All @@ -100,7 +100,7 @@ impl ModuleRegistry {

impl Drop for ModuleRegistry {
fn drop(&mut self) {
let mut info = GLOBAL_MODULES.lock().unwrap();
let mut info = GLOBAL_MODULES.write().unwrap();
for end in self.0.keys() {
info.unregister(*end);
}
Expand Down Expand Up @@ -235,7 +235,7 @@ impl GlobalModuleRegistry {
/// Returns whether the `pc`, according to globally registered information,
/// is a wasm trap or not.
pub(crate) fn is_wasm_pc(pc: usize) -> bool {
let modules = GLOBAL_MODULES.lock().unwrap();
let modules = GLOBAL_MODULES.read().unwrap();

match modules.module(pc) {
Some(entry) => match func_by_pc(&entry.module, pc) {
Expand All @@ -259,11 +259,8 @@ impl GlobalModuleRegistry {

// Work with the global instance of `GlobalModuleRegistry`. Note that only
// shared access is allowed, this isn't intended to mutate the contents.
//
// (right now we use a `Mutex` but if motivated we could one day use a
// `RwLock`)
pub(crate) fn with<R>(f: impl FnOnce(&GlobalModuleRegistry) -> R) -> R {
f(&GLOBAL_MODULES.lock().unwrap())
f(&GLOBAL_MODULES.read().unwrap())
}

/// Fetches frame information about a program counter in a backtrace.
Expand Down