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

Multithreaded parser (windows only)

Browse Source
This commit is contained in:
gingerBill
2018-02-25 13:45:44 +00:00
parent 1cd453db14
commit 5357181484
2 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+1
View File
@@ -1,3 +1,4 @@
#define USE_THREADED_PARSER 1
// #define NO_ARRAY_BOUNDS_CHECK // #define NO_ARRAY_BOUNDS_CHECK
// #define NO_POINTER_ARITHMETIC // #define NO_POINTER_ARITHMETIC
src/parser.cpp
+19 -21
View File
@@ -4258,20 +4258,12 @@ ParseFileError parse_files(Parser *p, String init_filename) {
array_add(&p->imports, init_imported_file); array_add(&p->imports, init_imported_file);
p->init_fullpath = init_fullpath; p->init_fullpath = init_fullpath;
/*
// IMPORTANT TODO(bill): Figure out why this doesn't work on *nix sometimes // IMPORTANT TODO(bill): Figure out why this doesn't work on *nix sometimes
#if USE_THREADED_PARSER && defined(GB_SYSTEM_WINDOWS) #if USE_THREADED_PARSER && defined(GB_SYSTEM_WINDOWS)
isize thread_count = gb_max(build_context.thread_count, 1); isize thread_count = gb_max(build_context.thread_count, 1);
if (thread_count > 1) { if (thread_count > 1) {
Array<gbThread> worker_threads = {}; isize volatile curr_import_index = 0;
array_init_count(&worker_threads, heap_allocator(), thread_count);
defer (array_free(&worker_threads));
for_array(i, p->imports) {
gbThread *t = &worker_threads[i];
gb_thread_init(t);
}
isize curr_import_index = 0;
// NOTE(bill): Make sure that these are in parsed in this order // NOTE(bill): Make sure that these are in parsed in this order
for (isize i = 0; i < shared_file_count; i++) { for (isize i = 0; i < shared_file_count; i++) {
@@ -4282,6 +4274,18 @@ ParseFileError parse_files(Parser *p, String init_filename) {
curr_import_index++; curr_import_index++;
} }
Array<gbThread> worker_threads = {};
array_init_count(&worker_threads, heap_allocator(), thread_count);
defer (array_free(&worker_threads));
for_array(i, worker_threads) {
gbThread *t = &worker_threads[i];
gb_thread_init(t);
}
defer (for_array(i, worker_threads) {
gb_thread_destroy(&worker_threads[i]);
});
for (;;) { for (;;) {
bool are_any_alive = false; bool are_any_alive = false;
for_array(i, worker_threads) { for_array(i, worker_threads) {
@@ -4291,9 +4295,6 @@ ParseFileError parse_files(Parser *p, String init_filename) {
} else if (curr_import_index < p->imports.count) { } else if (curr_import_index < p->imports.count) {
auto err = cast(ParseFileError)t->return_value; auto err = cast(ParseFileError)t->return_value;
if (err != ParseFile_None) { if (err != ParseFile_None) {
for_array(i, worker_threads) {
gb_thread_destroy(&worker_threads[i]);
}
return err; return err;
} }
t->user_index = curr_import_index++; t->user_index = curr_import_index++;
@@ -4306,9 +4307,6 @@ ParseFileError parse_files(Parser *p, String init_filename) {
} }
} }
for_array(i, worker_threads) {
gb_thread_destroy(&worker_threads[i]);
}
} else { } else {
for_array(i, p->imports) { for_array(i, p->imports) {
ParseFileError err = parse_import(p, p->imports[i]); ParseFileError err = parse_import(p, p->imports[i]);
@@ -4317,15 +4315,15 @@ ParseFileError parse_files(Parser *p, String init_filename) {
} }
} }
} }
#else */ #else
isize import_index = 0;
for (; import_index < p->imports.count; import_index++) { for_array(i, p->imports) {
ParseFileError err = parse_import(p, p->imports[import_index]); ParseFileError err = parse_import(p, p->imports[i]);
if (err != ParseFile_None) { if (err != ParseFile_None) {
return err; return err;
} }
} }
// #endif #endif
for_array(i, p->files) { for_array(i, p->files) {
p->total_token_count += p->files[i]->tokens.count; p->total_token_count += p->files[i]->tokens.count;