Skip to content

Only log after determining global stderr_log filters #1653

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

Open
charles-lunarg wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Only log after determining global stderr_log filters #1653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions loader/loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1975,6 +1975,8 @@ void loader_initialize(void) {

// initialize logging
loader_init_global_debug_level();
update_global_loader_settings();

#if defined(_WIN32)
windows_initialization();
#endif
Expand All @@ -1998,6 +2000,9 @@ void loader_initialize(void) {
#if defined(LOADER_USE_UNSAFE_FILE_SEARCH)
loader_log(NULL, VULKAN_LOADER_WARN_BIT, 0, "Vulkan Loader: unsafe searching is enabled");
#endif

log_global_settings();

#if defined(_WIN32)
return TRUE;
#endif
Expand Down
32 changes: 22 additions & 10 deletions loader/settings.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,17 @@ void log_settings(const struct loader_instance* inst, loader_settings* settings)
loader_log(inst, VULKAN_LOADER_DEBUG_BIT, 0, "---------------------------------");
}

void log_global_settings() {
loader_platform_thread_lock_mutex(&global_loader_settings_lock);
if (global_loader_settings.settings_active) {
log_settings(NULL, &global_loader_settings);
} else {
loader_log(NULL, VULKAN_LOADER_INFO_BIT, 0,
"No valid vk_loader_settings.json file found, no loader settings will be active");
}
loader_platform_thread_unlock_mutex(&global_loader_settings_lock);
}

// Loads the vk_loader_settings.json file
// Returns VK_SUCCESS if it was found & was successfully parsed. Otherwise, it returns VK_ERROR_INITIALIZATION_FAILED if it
// wasn't found or failed to parse, and returns VK_ERROR_OUT_OF_HOST_MEMORY if it was unable to allocate enough memory.
Expand All @@ -316,16 +327,12 @@ VkResult get_loader_settings(const struct loader_instance* inst, loader_settings
#if defined(WIN32)
res = windows_get_loader_settings_file_path(inst, &settings_file_path);
if (res != VK_SUCCESS) {
loader_log(inst, VULKAN_LOADER_INFO_BIT, 0,
"No valid vk_loader_settings.json file found, no loader settings will be active");
goto out;
}

#elif COMMON_UNIX_PLATFORMS
res = get_unix_settings_path(inst, &settings_file_path);
if (res != VK_SUCCESS) {
loader_log(inst, VULKAN_LOADER_INFO_BIT, 0,
"No valid vk_loader_settings.json file found, no loader settings will be active");
goto out;
}
#else
Expand Down Expand Up @@ -489,12 +496,17 @@ TEST_FUNCTION_EXPORT VkResult update_global_loader_settings(void) {
loader_settings settings = {0};
VkResult res = get_loader_settings(NULL, &settings);
loader_platform_thread_lock_mutex(&global_loader_settings_lock);

free_loader_settings(NULL, &global_loader_settings);
if (res == VK_SUCCESS) {
if (!check_if_settings_are_equal(&settings, &global_loader_settings)) {
log_settings(NULL, &settings);
}
if (res != VK_SUCCESS) {
free_loader_settings(NULL, &settings);
// If we failed to get the global loader settings file, unset the current loader settings
free_loader_settings(NULL, &global_loader_settings);
memset(&global_loader_settings, 0, sizeof(loader_settings));
} else if (check_if_settings_are_equal(&settings, &global_loader_settings)) {
// If we successfully got the new global loader settings, but is identical to old settings, return after cleaning up
free_loader_settings(NULL, &settings);
} else {
// Replace the current global loader settings with the new ones, setting the debug level if there are any debug filters set
free_loader_settings(NULL, &global_loader_settings);

memcpy(&global_loader_settings, &settings, sizeof(loader_settings));
if (global_loader_settings.settings_active && global_loader_settings.debug_level > 0) {
Expand Down
3 changes: 2 additions & 1 deletion loader/settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,9 @@ void free_loader_settings(const struct loader_instance* inst, loader_settings* l

// Log the settings to the console
void log_settings(const struct loader_instance* inst, loader_settings* settings);
void log_global_settings();

// Every global function needs to call this at startup to insure that
// Every global function needs to call this at startup to insure that its up to date
TEST_FUNCTION_EXPORT VkResult update_global_loader_settings(void);

// Needs to be called during startup -
Expand Down
3 changes: 3 additions & 0 deletions loader/trampoline.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,9 @@ LOADER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateInstance(const VkInstanceCr
if (settings_file_res == VK_ERROR_OUT_OF_HOST_MEMORY) {
res = settings_file_res;
goto out;
} else if (settings_file_res != VK_SUCCESS) {
loader_log(ptr_instance, VULKAN_LOADER_INFO_BIT, 0,
"No valid vk_loader_settings.json file found, no loader settings will be active");
}
if (ptr_instance->settings.settings_active) {
log_settings(ptr_instance, &ptr_instance->settings);
Expand Down
Loading