employer
/
tame
1
0
Fork 0
Code Packages Releases Activity

tamer: sym: Only prefill 32-bit global interner 

This is the interner that is intended to be used with the majority of the
system; the 16-bit interner is left around for the moment, but will likely
later become specialized.
main
Mike Gerwitz 2021-09-23 15:26:57 -04:00
parent e91aeef478
commit 15ff00b3cf
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tamer/src/sym/prefill.rs
View File

@ -38,7 +38,7 @@ type StaticSymbolSize = u8;
/// Statically-allocated symbol.
///
/// This symbol is generated at compile-time and expected to be available in
/// any global interner once it has been initialized.
/// the 32-bit global interner once it has been initialized.
///
/// This symbol contains a number of `const` methods,
/// allowing for this symbol to be easily used to construct static
@ -50,7 +50,7 @@ impl StaticSymbolId {
/// Cast static symbol into a [`SymbolId`] suitable for the global
/// program-level interner.
///
/// This is safe since global interners will always contain this
/// This is safe since global interner will always contain this
/// symbol before it can be read.
pub const fn as_prog_sym(self) -> SymbolId<global::ProgSymSize> {
SymbolId(unsafe {

25
tamer/src/sym/symbol.rs
View File

@ -137,12 +137,6 @@ pub trait SymbolIndexSize:
macro_rules! supported_symbol_index {
($prim:ty, $nonzero:ty, $interner:ty, $global:ident) => {
thread_local! {
pub(super) static $global: $interner = super::prefill::fill(
<$interner>::with_capacity(global::INIT_GLOBAL_INTERNER_CAPACITY)
);
}
impl SymbolIndexSize for $prim {
type NonZero = $nonzero;
type Interner = $interner;
@ -172,8 +166,19 @@ macro_rules! supported_symbol_index {
type Static16Interner = DefaultInterner<'static, u16>;
type Static32Interner = DefaultInterner<'static, u32>;
supported_symbol_index!(u16, NonZeroU16, Static16Interner, INTERNER_PKG);
supported_symbol_index!(u32, NonZeroU32, Static32Interner, INTERNER_PROG);
thread_local! {
pub(super) static INTERNER_16: Static16Interner =
Static16Interner::with_capacity(global::INIT_GLOBAL_INTERNER_CAPACITY);
// Only the 32-bit integer, which is the default for `SymbolId`, gets
// prefilled with static symbols.
pub(super) static INTERNER_32: Static32Interner = super::prefill::fill(
Static32Interner::with_capacity(global::INIT_GLOBAL_INTERNER_CAPACITY)
);
}
supported_symbol_index!(u16, NonZeroU16, Static16Interner, INTERNER_16);
supported_symbol_index!(u32, NonZeroU32, Static32Interner, INTERNER_32);
/// A string retrieved from the intern pool using a [`SymbolId`].
///
@ -440,7 +445,7 @@ mod test {
#[test]
fn str_lookup_using_global_interner() {
INTERNER_PKG.with(|interner| {
INTERNER_32.with(|interner| {
let given = "test global intern";
let sym = interner.intern(given);
@ -455,7 +460,7 @@ mod test {
assert_eq!("foo", sym.lookup_str());
INTERNER_PKG.with(|interner| {
INTERNER_32.with(|interner| {
assert_eq!(
sym,
interner.intern("foo"),