Skip to content

Commit 623ba4e

Browse files
committed
Enable ze_logger creation caller printing
Signed-off-by: Russell McGuire <russell.w.mcguire@intel.com>
1 parent b726db5 commit 623ba4e

4 files changed

Lines changed: 9 additions & 5 deletions

File tree

source/layers/validation/ze_validation_layer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace validation_layer
2525
enableThreadingValidation = getenv_tobool( "ZE_ENABLE_THREADING_VALIDATION" );
2626
verboseLogging = getenv_tobool( "ZEL_LOADER_LOGGING_ENABLE_SUCCESS_PRINT" );
2727

28-
logger = loader::createLogger();
28+
logger = loader::createLogger("Validation Layer");
2929
}
3030

3131
///////////////////////////////////////////////////////////////////////////////

source/loader/ze_loader.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,11 @@ namespace loader
638638
auto discoveredDrivers = discoverEnabledDrivers();
639639
std::string loadLibraryErrorValue;
640640

641-
zel_logger = createLogger();
641+
#ifdef L0_STATIC_LOADER_BUILD
642+
zel_logger = createLogger("Static Loader");
643+
#else
644+
zel_logger = createLogger("Dynamic Loader");
645+
#endif
642646

643647
if ((getenv_string("ZEL_LOADER_LOGGING_LEVEL") == "trace") && !debugTraceEnabled) {
644648
debugTraceEnabled = true;

source/utils/ze_logger.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ std::string to_string(ze_result_t result) {
443443
#define LOADER_LOG_FILE "ze_loader.log"
444444
#define LOADER_LOG_FILE_DIRECTORY ".oneapi_logs"
445445

446-
std::shared_ptr<ZeLogger> createLogger() {
446+
std::shared_ptr<ZeLogger> createLogger(const std::string &caller) {
447447
std::string log_directory = getenv_string("ZEL_LOADER_LOG_DIR");
448448
if (log_directory.empty()) {
449449
std::string home_dir;
@@ -530,7 +530,7 @@ std::shared_ptr<ZeLogger> createLogger() {
530530
// Emit the active configuration as the first log message so the user can
531531
// confirm what was enabled and where output is going.
532532
std::string cfg;
533-
cfg = "Loader logging enabled:";
533+
cfg = caller + " logging enabled:";
534534
cfg += "\n ZEL_LOADER_LOG_CONSOLE : " + std::string(log_console ? "stderr" : "disabled");
535535
cfg += "\n ZEL_ENABLE_LOADER_LOGGING : " + std::string(logging_enabled ? "enabled" : "disabled");
536536
cfg += "\n ZEL_LOADER_LOGGING_LEVEL : " + log_level;

source/utils/ze_logger.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class ZeLogger {
9090
std::string to_string(ze_result_t result);
9191

9292
// Factory: reads ZEL_* env vars and constructs an appropriately configured logger.
93-
std::shared_ptr<ZeLogger> createLogger();
93+
std::shared_ptr<ZeLogger> createLogger(const std::string &caller = "Loader");
9494

9595
} // namespace loader
9696

0 commit comments

Comments
 (0)