Skip to content

Add idempotent behavior to loader handle loading #649

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

Closed
SATVIKsynopsis wants to merge 2 commits into from
Closed

Add idempotent behavior to loader handle loading #649

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
439a77a
added idempotent checks for load_handle
SATVIKsynopsis Mar 1, 2026
f258571
added case 3
SATVIKsynopsis Mar 3, 2026
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
94 changes: 78 additions & 16 deletions source/loader/source/loader_impl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1278,11 +1278,27 @@ int loader_impl_load_from_file(plugin_manager manager, plugin p, loader_impl imp
}

if (loader_impl_handle_name(manager, paths[0], path) > 1 && loader_impl_get_handle(impl, path) != NULL)
{
log_write("metacall", LOG_LEVEL_ERROR, "Load from file handle failed, handle with name %s already loaded", path);

return 1;
}
{
if (handle_ptr !=NULL && *handle_ptr == NULL) {
*handle_ptr = loader_impl_get_handle(impl, path);
} else if (handle_ptr !=NULL && *handle_ptr !=NULL) {
loader_handle_impl existing = (loader_handle_impl)loader_impl_get_handle(impl, path);
loader_handle_impl target = (loader_handle_impl)*handle_ptr;
char *duplicated_key = NULL;

if (context_contains(existing->ctx, target->ctx, &duplicated_key) ==0 && duplicated_key !=NULL) {
log_write("metacall", LOG_LEVEL_ERROR, "Duplicated symbol found named '%s' already defined in the handle scope by handle: %s", duplicated_key, existing->path);
return 1;
}

if (context_append(target->ctx, existing->ctx) != 0) {
return 1;
}
vector_push_back_var(existing->populated_handles, target);
}
return 0;

}

init_order_not_initialized = loader_impl_handle_init_order(impl, handle_ptr, &init_order);

Expand Down Expand Up @@ -1343,16 +1359,30 @@ int loader_impl_load_from_memory(plugin_manager manager, plugin p, loader_impl i

if (loader_impl_load_from_memory_name(impl, name, buffer, size) != 0)
{
log_write("metacall", LOG_LEVEL_ERROR, "Load from memory handle failed, name could not be generated correctly");

return 1;
return 0;
}

if (loader_impl_get_handle(impl, name) != NULL)
{
log_write("metacall", LOG_LEVEL_ERROR, "Load from memory handle failed, handle with name %s already loaded", name);

return 1;
if (handle_ptr !=NULL && *handle_ptr == NULL) {
*handle_ptr = loader_impl_get_handle(impl, name);
} else if (handle_ptr !=NULL && *handle_ptr !=NULL) {
loader_handle_impl existing = (loader_handle_impl)loader_impl_get_handle(impl, name);
loader_handle_impl target = (loader_handle_impl)*handle_ptr;
char *duplicated_key = NULL;

if (context_contains(existing->ctx, target->ctx, &duplicated_key) ==0 && duplicated_key !=NULL) {
log_write("metacall", LOG_LEVEL_ERROR, "Duplicated symbol found named '%s' already defined in the handle scope by handle: %s", duplicated_key, existing->path);
return 1;
}

if (context_append(target->ctx, existing->ctx) != 0) {
return 1;
}
vector_push_back_var(existing->populated_handles, target);
}
return 0;

}

init_order_not_initialized = loader_impl_handle_init_order(impl, handle_ptr, &init_order);
Expand Down Expand Up @@ -1389,9 +1419,25 @@ int loader_impl_load_from_package(plugin_manager manager, plugin p, loader_impl

if (loader_impl_get_handle(impl, subpath) != NULL)
{
log_write("metacall", LOG_LEVEL_ERROR, "Load from package handle failed, handle with name %s already loaded", subpath);

return 1;
if (handle_ptr !=NULL && *handle_ptr == NULL) {
*handle_ptr = loader_impl_get_handle(impl, subpath);
} else if (handle_ptr !=NULL && *handle_ptr !=NULL) {
loader_handle_impl existing = (loader_handle_impl)loader_impl_get_handle(impl, subpath);
loader_handle_impl target = (loader_handle_impl)*handle_ptr;
char *duplicated_key = NULL;

if (context_contains(existing->ctx, target->ctx, &duplicated_key) ==0 && duplicated_key !=NULL) {
log_write("metacall", LOG_LEVEL_ERROR, "Duplicated symbol found named '%s' already defined in the handle scope by handle: %s", duplicated_key, existing->path);
return 1;
}

if (context_append(target->ctx, existing->ctx) != 0) {
return 1;
}
vector_push_back_var(existing->populated_handles, target);
}
return 0;

}

init_order_not_initialized = loader_impl_handle_init_order(impl, handle_ptr, &init_order);
Expand Down Expand Up @@ -1489,9 +1535,25 @@ int loader_impl_handle_initialize(plugin_manager manager, plugin p, loader_impl

if (loader_impl_handle_name(manager, name, path) > 1 && loader_impl_get_handle(impl, path) != NULL)
{
log_write("metacall", LOG_LEVEL_ERROR, "Initialize handle failed, handle with name %s already loaded", path);
if (handle_ptr !=NULL && *handle_ptr == NULL) {
*handle_ptr = loader_impl_get_handle(impl, path);
} else if (handle_ptr !=NULL && *handle_ptr !=NULL) {
loader_handle_impl existing = (loader_handle_impl)loader_impl_get_handle(impl, path);
loader_handle_impl target = (loader_handle_impl)*handle_ptr;
char *duplicated_key = NULL;

return 1;
if (context_contains(existing->ctx, target->ctx, &duplicated_key) ==0 && duplicated_key !=NULL) {
log_write("metacall", LOG_LEVEL_ERROR, "Duplicated symbol found named '%s' already defined in the handle scope by handle: %s", duplicated_key, existing->path);
return 1;
}

if (context_append(target->ctx, existing->ctx) != 0) {
return 1;
}
vector_push_back_var(existing->populated_handles, target);
}
return 0;

}

init_order_not_initialized = loader_impl_handle_init_order(impl, handle_ptr, &init_order);
Expand Down
Loading