Skip to content

Let's try ref counting #451

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

Merged
merged 4 commits into from
May 8, 2023
Merged

Let's try ref counting #451

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
301fd8d
Let's try ref counting
bretambrose May 4, 2023
bc7b940
Merge branch 'main' into MultiInitTake2
bretambrose May 8, 2023
b12818e
Remove misleading comment and expand scope of crash handler
bretambrose May 8, 2023
f8b379e
Make aws-c-* init and cleanup matching. It was harmless now, but wou…
bretambrose May 8, 2023
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
165 changes: 92 additions & 73 deletions source/module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1074,31 +1074,63 @@ static void s_install_crash_handler(void) {
#endif
}

static void s_uninstall_crash_handler(void) {
#if defined(_WIN32)
SetUnhandledExceptionFilter(NULL);
#elif defined(AWS_HAVE_EXECINFO)
sigaction(SIGSEGV, NULL, NULL);
sigaction(SIGABRT, NULL, NULL);
sigaction(SIGILL, NULL, NULL);
sigaction(SIGBUS, NULL, NULL);
#endif
}

static struct aws_mutex s_module_lock = AWS_MUTEX_INIT;
static uint32_t s_module_initialize_count = 0;

static void s_napi_context_finalize(napi_env env, void *user_data, void *finalize_hint) {
(void)env;
(void)finalize_hint;
aws_client_bootstrap_release(s_default_client_bootstrap);
aws_host_resolver_release(s_default_host_resolver);
aws_event_loop_group_release(s_node_uv_elg);

aws_thread_join_all_managed();
aws_mutex_lock(&s_module_lock);
AWS_FATAL_ASSERT(s_module_initialize_count > 0);
--s_module_initialize_count;

if (s_module_initialize_count == 0) {
aws_client_bootstrap_release(s_default_client_bootstrap);
s_default_client_bootstrap = NULL;

aws_host_resolver_release(s_default_host_resolver);
s_default_host_resolver = NULL;

aws_event_loop_group_release(s_node_uv_elg);
s_node_uv_elg = NULL;

aws_unregister_log_subject_info_list(&s_log_subject_list);
aws_unregister_error_info(&s_error_list);
aws_auth_library_clean_up();
aws_mqtt_library_clean_up();
aws_thread_join_all_managed();

aws_unregister_log_subject_info_list(&s_log_subject_list);
aws_unregister_error_info(&s_error_list);
aws_auth_library_clean_up();
aws_mqtt_library_clean_up();

s_uninstall_crash_handler();
}

struct aws_napi_context *ctx = user_data;
aws_napi_logger_destroy(ctx->logger);
struct aws_allocator *ctx_allocator = ctx->allocator;
aws_mem_release(ctx->allocator, ctx);

if (ctx_allocator != aws_default_allocator()) {
if (s_allocator == ctx_allocator) {
s_allocator = NULL;
if (s_module_initialize_count == 0) {
if (ctx_allocator != aws_default_allocator()) {
if (s_allocator == ctx_allocator) {
s_allocator = NULL;
}
aws_mem_tracer_destroy(ctx_allocator);
}
aws_mem_tracer_destroy(ctx_allocator);
}

aws_mutex_unlock(&s_module_lock);
}

static struct aws_napi_context *s_napi_context_new(struct aws_allocator *allocator, napi_env env, napi_value exports) {
Expand Down Expand Up @@ -1136,76 +1168,63 @@ static bool s_create_and_register_function(
return true;
}

/*
* Temporary hack to detect multi-init so we can throw an exception because we haven't figured out the right way
* to support it yet. Better than a hard crash in native code.
*/
static struct aws_mutex s_module_lock = AWS_MUTEX_INIT;
static bool s_module_initialized = false;

/* napi_value */ NAPI_MODULE_INIT() /* (napi_env env, napi_value exports) */ {

bool already_initialized = false;
aws_mutex_lock(&s_module_lock);
if (s_module_initialized) {
already_initialized = true;
}
s_module_initialized = true;
aws_mutex_unlock(&s_module_lock);

if (already_initialized) {
napi_throw_error(env, NULL, "Aws-crt-nodejs does not yet support multi-initialization.");
return NULL;
}

s_install_crash_handler();

struct aws_allocator *allocator = aws_napi_get_allocator();
/* context is bound to exports, will be cleaned up by finalizer */
s_napi_context_new(allocator, env, exports);

aws_cal_library_init(allocator);
aws_http_library_init(allocator);
aws_mqtt_library_init(allocator);
aws_auth_library_init(allocator);
aws_register_error_info(&s_error_list);
aws_register_log_subject_info_list(&s_log_subject_list);

/* Initialize the event loop group */
/*
* We don't currently support multi-init of the module, but we should.
* Things that would need to be solved:
* (1) global objects (event loop group, logger, allocator, more)
* (2) multi-init/multi-cleanup of aws-c-*
* (3) allocator cross-talk/lifetimes
*/
AWS_FATAL_ASSERT(s_node_uv_elg == NULL);
s_node_uv_elg = aws_event_loop_group_new_default(allocator, 1, NULL);
AWS_FATAL_ASSERT(s_node_uv_elg != NULL);

/*
* Default host resolver and client bootstrap to use if none specific at the javascript level. In most
* cases the user doesn't even need to know about these, so let's let them leave it out completely.
*/
AWS_FATAL_ASSERT(s_default_host_resolver == NULL);

struct aws_host_resolver_default_options resolver_options = {
.max_entries = 64,
.el_group = s_node_uv_elg,
};
s_default_host_resolver = aws_host_resolver_new_default(allocator, &resolver_options);
AWS_FATAL_ASSERT(s_default_host_resolver != NULL);

AWS_FATAL_ASSERT(s_default_client_bootstrap == NULL);
if (s_module_initialize_count == 0) {
s_install_crash_handler();

aws_mqtt_library_init(allocator);
aws_auth_library_init(allocator);
aws_register_error_info(&s_error_list);
aws_register_log_subject_info_list(&s_log_subject_list);

/* Initialize the event loop group */
/*
* We don't currently support multi-init of the module, but we should.
* Things that would need to be solved:
* (1) global objects (event loop group, logger, allocator, more)
* (2) multi-init/multi-cleanup of aws-c-*
* (3) allocator cross-talk/lifetimes
*/
AWS_FATAL_ASSERT(s_node_uv_elg == NULL);
s_node_uv_elg = aws_event_loop_group_new_default(allocator, 1, NULL);
AWS_FATAL_ASSERT(s_node_uv_elg != NULL);

/*
* Default host resolver and client bootstrap to use if none specific at the javascript level. In most
* cases the user doesn't even need to know about these, so let's let them leave it out completely.
*/
AWS_FATAL_ASSERT(s_default_host_resolver == NULL);

struct aws_host_resolver_default_options resolver_options = {
.max_entries = 64,
.el_group = s_node_uv_elg,
};
s_default_host_resolver = aws_host_resolver_new_default(allocator, &resolver_options);
AWS_FATAL_ASSERT(s_default_host_resolver != NULL);

AWS_FATAL_ASSERT(s_default_client_bootstrap == NULL);

struct aws_client_bootstrap_options bootstrap_options = {
.event_loop_group = s_node_uv_elg,
.host_resolver = s_default_host_resolver,
};

s_default_client_bootstrap = aws_client_bootstrap_new(allocator, &bootstrap_options);

AWS_FATAL_ASSERT(s_default_client_bootstrap != NULL);
}

struct aws_client_bootstrap_options bootstrap_options = {
.event_loop_group = s_node_uv_elg,
.host_resolver = s_default_host_resolver,
};
++s_module_initialize_count;

s_default_client_bootstrap = aws_client_bootstrap_new(allocator, &bootstrap_options);
aws_mutex_unlock(&s_module_lock);

AWS_FATAL_ASSERT(s_default_client_bootstrap != NULL);
/* context is bound to exports, will be cleaned up by finalizer */
s_napi_context_new(allocator, env, exports);

napi_value null;
napi_get_null(env, &null);
Expand Down