Move the Store::signature_cache field (#847)
This commit removes the `signature_cache` field from the `Store` type and performs a few internal changes which are aimed to be a bit forward looking towards #777, making `Store` threadsafe. The changes made here are: * The `SignatureRegistry` internal type now contains the reverse map that `signature_cache` was serving to do. This is populated on calls to `register` automatically and is accompanied by a `lookup` method as well. * The `register_wasmtime_signature` and `lookup_wasmtime_signature` methods were removed from `Store` and now instead work by using the `Compiler::signatures` field. * The `SignatureRegistry` type was updated to have interior mutability. The global `Compiler` type is highly likely to get shared across many threads through `Store`, so it needs some form of lock somewhere for mutation of the registry of signatures and this commit opts to put it inside `SignatureRegistry` which will eventually allow for the removal of most `&mut self` method on `Compiler`.
This commit is contained in:
@@ -5,6 +5,7 @@ use crate::vmcontext::VMSharedSignatureIndex;
|
||||
use more_asserts::{assert_lt, debug_assert_lt};
|
||||
use std::collections::{hash_map, HashMap};
|
||||
use std::convert::TryFrom;
|
||||
use std::sync::RwLock;
|
||||
use wasmtime_environ::ir;
|
||||
|
||||
/// WebAssembly requires that the caller and callee signatures in an indirect
|
||||
@@ -13,21 +14,33 @@ use wasmtime_environ::ir;
|
||||
/// index comparison.
|
||||
#[derive(Debug)]
|
||||
pub struct SignatureRegistry {
|
||||
signature_hash: HashMap<ir::Signature, VMSharedSignatureIndex>,
|
||||
// This structure is stored in a `Compiler` and is intended to be shared
|
||||
// across many instances. Ideally instances can themselves be sent across
|
||||
// threads, and ideally we can compile across many threads. As a result we
|
||||
// use interior mutability here with a lock to avoid having callers to
|
||||
// externally synchronize calls to compilation.
|
||||
inner: RwLock<Inner>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
struct Inner {
|
||||
signature2index: HashMap<ir::Signature, VMSharedSignatureIndex>,
|
||||
index2signature: HashMap<VMSharedSignatureIndex, ir::Signature>,
|
||||
}
|
||||
|
||||
impl SignatureRegistry {
|
||||
/// Create a new `SignatureRegistry`.
|
||||
pub fn new() -> Self {
|
||||
Self {
|
||||
signature_hash: HashMap::new(),
|
||||
inner: Default::default(),
|
||||
}
|
||||
}
|
||||
|
||||
/// Register a signature and return its unique index.
|
||||
pub fn register(&mut self, sig: &ir::Signature) -> VMSharedSignatureIndex {
|
||||
let len = self.signature_hash.len();
|
||||
match self.signature_hash.entry(sig.clone()) {
|
||||
pub fn register(&self, sig: &ir::Signature) -> VMSharedSignatureIndex {
|
||||
let mut inner = self.inner.write().unwrap();
|
||||
let len = inner.signature2index.len();
|
||||
match inner.signature2index.entry(sig.clone()) {
|
||||
hash_map::Entry::Occupied(entry) => *entry.get(),
|
||||
hash_map::Entry::Vacant(entry) => {
|
||||
// Keep `signature_hash` len under 2**32 -- VMSharedSignatureIndex::new(std::u32::MAX)
|
||||
@@ -39,8 +52,22 @@ impl SignatureRegistry {
|
||||
);
|
||||
let sig_id = VMSharedSignatureIndex::new(u32::try_from(len).unwrap());
|
||||
entry.insert(sig_id);
|
||||
inner.index2signature.insert(sig_id, sig.clone());
|
||||
sig_id
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Looks up a shared signature index within this registry.
|
||||
///
|
||||
/// Note that for this operation to be semantically correct the `idx` must
|
||||
/// have previously come from a call to `register` of this same object.
|
||||
pub fn lookup(&self, idx: VMSharedSignatureIndex) -> Option<ir::Signature> {
|
||||
self.inner
|
||||
.read()
|
||||
.unwrap()
|
||||
.index2signature
|
||||
.get(&idx)
|
||||
.cloned()
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user