ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 07:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove need for scope mutex, make Scope singly linked list tree with atomic pointers

Browse Source
This commit is contained in:
gingerBill
2021-07-14 23:49:35 +01:00
parent 10f4d8df32
commit 981b9fb7a8
2 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/checker.cpp
+7 -12
View File
@@ -32,8 +32,7 @@ bool is_operand_undef(Operand o) {
void scope_reset(Scope *scope) { void scope_reset(Scope *scope) {
if (scope == nullptr) return; if (scope == nullptr) return;
scope->first_child = nullptr; scope->head_child.store(nullptr, std::memory_order_relaxed);
scope->last_child = nullptr;
string_map_clear(&scope->elements); string_map_clear(&scope->elements);
ptr_set_clear(&scope->imported); ptr_set_clear(&scope->imported);
} }
@@ -233,10 +232,10 @@ Scope *create_scope(CheckerInfo *info, Scope *parent, isize init_elements_capaci
s->delayed_directives.allocator = heap_allocator(); s->delayed_directives.allocator = heap_allocator();
if (parent != nullptr && parent != builtin_pkg->scope) { if (parent != nullptr && parent != builtin_pkg->scope) {
// TODO(bill): make this an atomic operation Scope *prev_head_child = parent->head_child.exchange(s, std::memory_order_acq_rel);
if (info) mutex_lock(&info->scope_mutex); if (prev_head_child) {
DLIST_APPEND(parent->first_child, parent->last_child, s); prev_head_child->next.store(s, std::memory_order_release);
if (info) mutex_unlock(&info->scope_mutex); }
} }
if (parent != nullptr && parent->flags & ScopeFlag_ContextDefined) { if (parent != nullptr && parent->flags & ScopeFlag_ContextDefined) {
@@ -305,7 +304,7 @@ void destroy_scope(Scope *scope) {
} }
} }
for (Scope *child = scope->first_child; child != nullptr; child = child->next) { for (Scope *child = scope->head_child; child != nullptr; child = child->next) {
destroy_scope(child); destroy_scope(child);
} }
@@ -625,9 +624,7 @@ void check_scope_usage(Checker *c, Scope *scope) {
array_free(&vetted_entities); array_free(&vetted_entities);
for (Scope *child = scope->first_child; for (Scope *child = scope->head_child; child != nullptr; child = child->next) {
child != nullptr;
child = child->next) {
if (child->flags & (ScopeFlag_Proc|ScopeFlag_Type|ScopeFlag_File)) { if (child->flags & (ScopeFlag_Proc|ScopeFlag_Type|ScopeFlag_File)) {
// Ignore these // Ignore these
} else { } else {
@@ -875,7 +872,6 @@ void init_checker_info(CheckerInfo *i) {
mutex_init(&i->deps_mutex); mutex_init(&i->deps_mutex);
mutex_init(&i->identifier_uses_mutex); mutex_init(&i->identifier_uses_mutex);
mutex_init(&i->foreign_mutex); mutex_init(&i->foreign_mutex);
mutex_init(&i->scope_mutex);
#undef TIME_SECTION #undef TIME_SECTION
} }
@@ -906,7 +902,6 @@ void destroy_checker_info(CheckerInfo *i) {
mutex_destroy(&i->deps_mutex); mutex_destroy(&i->deps_mutex);
mutex_destroy(&i->identifier_uses_mutex); mutex_destroy(&i->identifier_uses_mutex);
mutex_destroy(&i->foreign_mutex); mutex_destroy(&i->foreign_mutex);
mutex_destroy(&i->scope_mutex);
} }
CheckerContext make_checker_context(Checker *c) { CheckerContext make_checker_context(Checker *c) {
src/checker.hpp
+2 -6
View File
@@ -187,11 +187,8 @@ enum { DEFAULT_SCOPE_CAPACITY = 29 };
struct Scope { struct Scope {
Ast * node; Ast * node;
Scope * parent; Scope * parent;
// TODO(bill): make this is an ATOMIC singular linked list std::atomic<Scope *> next;
Scope * prev; std::atomic<Scope *> head_child;
Scope * next;
Scope * first_child;
Scope * last_child;
StringMap<Entity *> elements; StringMap<Entity *> elements;
Array<Ast *> delayed_directives; Array<Ast *> delayed_directives;
@@ -299,7 +296,6 @@ struct CheckerInfo {
// these variables will be of contention // these variables will be of contention
BlockingMutex deps_mutex; // NOT recursive & Only used in `check_proc_body` BlockingMutex deps_mutex; // NOT recursive & Only used in `check_proc_body`
BlockingMutex scope_mutex; // NOT recursive & Only used in `create_scope`
gbMutex gen_procs_mutex; // Possibly recursive gbMutex gen_procs_mutex; // Possibly recursive
gbMutex gen_types_mutex; // Possibly recursive gbMutex gen_types_mutex; // Possibly recursive