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

Jump to bottom

Minor clean up in symbol allocation and lookup #22012

Merged
merged 1 commit into from
May 23, 2017
Merged

Minor clean up in symbol allocation and lookup #22012

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
13 changes: 6 additions & 7 deletions src/symbol.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
extern "C" {
#endif

static jl_sym_t *volatile symtab = NULL;
static jl_sym_t *symtab = NULL;

static uintptr_t hash_symbol(const char *str, size_t len)
{
Expand All @@ -34,7 +34,7 @@ static jl_sym_t *mk_symbol(const char *str, size_t len)

jl_taggedvalue_t *tag = (jl_taggedvalue_t*)jl_gc_perm_alloc_nolock(nb, 0);
sym = (jl_sym_t*)jl_valueof(tag);
// set to old marked since we don't need write barrier on it.
// set to old marked so that we won't look at it in the GC or write barrier.
tag->header = ((uintptr_t)jl_sym_type) | GC_OLD_MARKED;
sym->left = sym->right = NULL;
sym->hash = hash_symbol(str, len);
Expand All @@ -43,10 +43,9 @@ static jl_sym_t *mk_symbol(const char *str, size_t len)
return sym;
}

static jl_sym_t *symtab_lookup(jl_sym_t *volatile *ptree, const char *str,
size_t len, jl_sym_t *volatile **slot)
static jl_sym_t *symtab_lookup(jl_sym_t **ptree, const char *str, size_t len, jl_sym_t ***slot)
{
jl_sym_t *node = jl_atomic_load_acquire(ptree);
jl_sym_t *node = jl_atomic_load_acquire(ptree); // consume
uintptr_t h = hash_symbol(str, len);

// Tree nodes sorted by major key of (int(hash)) and minor key of (str).
Expand All @@ -64,7 +63,7 @@ static jl_sym_t *symtab_lookup(jl_sym_t *volatile *ptree, const char *str,
ptree = &node->left;
else
ptree = &node->right;
node = jl_atomic_load_acquire(ptree);
node = jl_atomic_load_acquire(ptree); // consume
}
if (slot != NULL)
*slot = ptree;
Expand All @@ -73,7 +72,7 @@ static jl_sym_t *symtab_lookup(jl_sym_t *volatile *ptree, const char *str,

static jl_sym_t *_jl_symbol(const char *str, size_t len)
{
jl_sym_t *volatile *slot;
jl_sym_t **slot;
jl_sym_t *node = symtab_lookup(&symtab, str, len, &slot);
if (node == NULL) {
JL_LOCK_NOGC(&gc_perm_lock);
Expand Down