perf: batch pending queue allocations in poll and retry
Replace per-module malloc calls in stk_pending_retry and stk_poll with bulk allocations. - stk_pending_retry: single realloc to module_count + stk_pending_count before the retry loop instead of realloc + 1 per module at attempt_load - stk_poll unload loop: collect cascade deps into a batch array, call stk_pending_add_batch once after instead of stk_pending_add per module - stk_poll cascade loop: same pattern, batch collect and add once per cascade iteration
This commit is contained in:
+3
-3
@@ -1026,6 +1026,9 @@ size_t stk_pending_retry(void)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (stk_module_realloc_memory(module_count + stk_pending_count) != 0)
|
||||||
|
return 0;
|
||||||
|
|
||||||
for (i = 0; i < stk_pending_count; i++) {
|
for (i = 0; i < stk_pending_count; i++) {
|
||||||
extract_module_id(stk_pending[i], pending_id);
|
extract_module_id(stk_pending[i], pending_id);
|
||||||
if (is_mod_loaded(pending_id) >= 0) {
|
if (is_mod_loaded(pending_id) >= 0) {
|
||||||
@@ -1073,9 +1076,6 @@ size_t stk_pending_retry(void)
|
|||||||
continue;
|
continue;
|
||||||
|
|
||||||
attempt_load:
|
attempt_load:
|
||||||
if (stk_module_realloc_memory(module_count + 1) != 0)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
result = stk_module_load(stk_pending[i], module_count);
|
result = stk_module_load(stk_pending[i], module_count);
|
||||||
if (result != STK_MOD_INIT_SUCCESS)
|
if (result != STK_MOD_INIT_SUCCESS)
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
@@ -303,15 +303,17 @@ size_t stk_poll(void)
|
|||||||
size_t expanded_count;
|
size_t expanded_count;
|
||||||
size_t index, oi;
|
size_t index, oi;
|
||||||
int is_orig;
|
int is_orig;
|
||||||
char dep_tmp_path[STK_PATH_MAX_OS];
|
|
||||||
size_t write;
|
size_t write;
|
||||||
size_t li;
|
size_t li;
|
||||||
int fi;
|
int fi;
|
||||||
int file_index, mod_index, target_index;
|
int file_index, mod_index, target_index;
|
||||||
size_t cascade_indices[STK_PATH_MAX];
|
size_t cascade_indices[STK_PATH_MAX];
|
||||||
size_t cascade_count;
|
size_t cascade_count;
|
||||||
char cascade_tmp_path[STK_PATH_MAX_OS];
|
|
||||||
size_t j, k, cascade_write;
|
size_t j, k, cascade_write;
|
||||||
|
char (*dep_batch)[STK_PATH_MAX_OS] = NULL;
|
||||||
|
size_t dep_batch_count = 0;
|
||||||
|
char (*cascade_batch)[STK_PATH_MAX_OS] = NULL;
|
||||||
|
size_t cascade_batch_count = 0;
|
||||||
|
|
||||||
if (module_count > 0) {
|
if (module_count > 0) {
|
||||||
module_ids = malloc(module_count * sizeof(*module_ids));
|
module_ids = malloc(module_count * sizeof(*module_ids));
|
||||||
@@ -403,6 +405,9 @@ begin_operations:
|
|||||||
stk_collect_dependents(unload_order, &expanded_count);
|
stk_collect_dependents(unload_order, &expanded_count);
|
||||||
stk_sort_unload_order(unload_order, expanded_count);
|
stk_sort_unload_order(unload_order, expanded_count);
|
||||||
|
|
||||||
|
dep_batch = malloc(expanded_count * sizeof(*dep_batch));
|
||||||
|
dep_batch_count = 0;
|
||||||
|
|
||||||
for (i = 0; i < expanded_count; i++) {
|
for (i = 0; i < expanded_count; i++) {
|
||||||
index = unload_order[i];
|
index = unload_order[i];
|
||||||
|
|
||||||
@@ -417,17 +422,27 @@ begin_operations:
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!is_orig) {
|
if (!is_orig && dep_batch) {
|
||||||
build_path(dep_tmp_path, sizeof(dep_tmp_path),
|
build_path(dep_batch[dep_batch_count],
|
||||||
|
sizeof(dep_batch[dep_batch_count]),
|
||||||
stk_tmp_dir, stk_modules[index].id);
|
stk_tmp_dir, stk_modules[index].id);
|
||||||
strncat(dep_tmp_path, STK_MODULE_EXT,
|
strncat(
|
||||||
sizeof(dep_tmp_path) -
|
dep_batch[dep_batch_count], STK_MODULE_EXT,
|
||||||
strlen(dep_tmp_path) - 1);
|
sizeof(dep_batch[dep_batch_count]) -
|
||||||
stk_pending_add(dep_tmp_path);
|
strlen(dep_batch[dep_batch_count]) - 1);
|
||||||
|
dep_batch_count++;
|
||||||
}
|
}
|
||||||
|
|
||||||
stk_module_unload(index);
|
stk_module_unload(index);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (dep_batch_count > 0)
|
||||||
|
stk_pending_add_batch(
|
||||||
|
(const char (*)[STK_PATH_MAX_OS])dep_batch,
|
||||||
|
dep_batch_count);
|
||||||
|
|
||||||
|
free(dep_batch);
|
||||||
|
dep_batch = NULL;
|
||||||
free(unload_order);
|
free(unload_order);
|
||||||
unload_order = NULL;
|
unload_order = NULL;
|
||||||
} else {
|
} else {
|
||||||
@@ -569,18 +584,37 @@ validate_deps:
|
|||||||
if (cascade_count == 0)
|
if (cascade_count == 0)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
cascade_batch = malloc(cascade_count * sizeof(*cascade_batch));
|
||||||
|
cascade_batch_count = 0;
|
||||||
|
|
||||||
for (j = 0; j < cascade_count; j++) {
|
for (j = 0; j < cascade_count; j++) {
|
||||||
index = cascade_indices[j];
|
index = cascade_indices[j];
|
||||||
stk_log_dependency_failures(index, "Unloading");
|
stk_log_dependency_failures(index, "Unloading");
|
||||||
build_path(cascade_tmp_path, sizeof(cascade_tmp_path),
|
if (cascade_batch) {
|
||||||
stk_tmp_dir, stk_modules[index].id);
|
build_path(
|
||||||
strncat(cascade_tmp_path, STK_MODULE_EXT,
|
cascade_batch[cascade_batch_count],
|
||||||
sizeof(cascade_tmp_path) -
|
sizeof(cascade_batch[cascade_batch_count]),
|
||||||
strlen(cascade_tmp_path) - 1);
|
stk_tmp_dir, stk_modules[index].id);
|
||||||
stk_pending_add(cascade_tmp_path);
|
strncat(
|
||||||
|
cascade_batch[cascade_batch_count],
|
||||||
|
STK_MODULE_EXT,
|
||||||
|
sizeof(cascade_batch[cascade_batch_count]) -
|
||||||
|
strlen(cascade_batch
|
||||||
|
[cascade_batch_count]) -
|
||||||
|
1);
|
||||||
|
cascade_batch_count++;
|
||||||
|
}
|
||||||
stk_module_unload(index);
|
stk_module_unload(index);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (cascade_batch_count > 0)
|
||||||
|
stk_pending_add_batch(
|
||||||
|
(const char (*)[STK_PATH_MAX_OS])cascade_batch,
|
||||||
|
cascade_batch_count);
|
||||||
|
|
||||||
|
free(cascade_batch);
|
||||||
|
cascade_batch = NULL;
|
||||||
|
|
||||||
cascade_write = 0;
|
cascade_write = 0;
|
||||||
for (j = 0; j < module_count; j++) {
|
for (j = 0; j < module_count; j++) {
|
||||||
if (stk_modules[j].handle != NULL) {
|
if (stk_modules[j].handle != NULL) {
|
||||||
|
|||||||
Reference in New Issue
Block a user