Minor cleanup of logging issues

+ Removed references in mako files to old logger
+ Removed some dead code
+ Fixed recursive log directory creation corner case

Signed-off-by: Russell McGuire <russell.w.mcguire@intel.com>

Author: rwmcguir

scripts/templates/ze_loader_internal.h.mako

@@ -32,7 +32,7 @@ from templates import helper as th
 #include "zer_ldrddi.h"
 
 #include "loader/ze_loader.h"
-#include "../utils/logging.h"
+#include "../utils/ze_logger.h"
 #include "source/lib/error_state.h"
 namespace loader
 {
@@ -138,7 +138,7 @@ namespace loader
         bool instrumentationEnabled = false;
         bool pciOrderingRequested = false;
         dditable_t tracing_dditable = {};
-        std::shared_ptr<Logger> zel_logger;
+        std::shared_ptr<ZeLogger> zel_logger;
         ze_driver_handle_t defaultZerDriverHandle = nullptr;
     };
 

source/loader/ze_loader_api.cpp

@@ -59,19 +59,6 @@ zelLoaderGetContext() {
     return loader::context;
 }
 
-///////////////////////////////////////////////////////////////////////////////
-/// @brief Get the loader's shared logger instance.
-///
-ZE_DLLEXPORT std::shared_ptr<loader::ZeLogger> *ZE_APICALL
-zelLoaderGetLogger() {
-    if (loader::context == nullptr)
-        return nullptr;
-    auto &log = loader::context->zel_logger;
-    if (!log)
-        return nullptr;
-    return &log;
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 /// @brief Internal function for Setting the ZE ddi table for the Tracing Layer.
 ///

source/loader/ze_loader_api.h

@@ -65,18 +65,6 @@ zeLoaderGetTracingHandle();
 ZE_DLLEXPORT loader::context_t *ZE_APICALL
 zelLoaderGetContext();
 
-///////////////////////////////////////////////////////////////////////////////
-/// @brief Get the loader's shared logger instance.
-///        Returns nullptr if the loader context is not yet initialized.
-///        Callers (e.g. the validation layer) should adopt this logger
-///        instead of creating their own to share a single file handle and mutex.
-///
-/// @returns
-///     - ::Pointer to the shared ZeLogger, or nullptr
-ZE_DLLEXPORT std::shared_ptr<loader::ZeLogger> *ZE_APICALL
-zelLoaderGetLogger();
-
-
 ///////////////////////////////////////////////////////////////////////////////
 /// @brief Exported function for getting version
 ///

source/utils/ze_logger.cpp

@@ -9,7 +9,9 @@
 #include "ze_logger.h"
 #include "ze_util.h"
 
+#include <cerrno>
 #include <chrono>
+#include <cstdio>
 #include <ctime>
 #include <iomanip>
 #include <iostream>
@@ -158,9 +160,10 @@ LogLevel logLevelFromString(const std::string &s) {
     if (s == "trace")    return LogLevel::trace;
     if (s == "debug")    return LogLevel::debug;
     if (s == "info")     return LogLevel::info;
-    if (s == "warn")     return LogLevel::warn;
-    if (s == "error")    return LogLevel::err;
-    if (s == "critical") return LogLevel::critical;
+    if (s == "warn" || s == "warning") return LogLevel::warn;
+    if (s == "err" || s == "error")    return LogLevel::err;
+    if (s == "crit" || s == "critical") return LogLevel::critical;
+    if (s == "off")      return LogLevel::off;
     return LogLevel::warn; // default
 }
 
@@ -205,7 +208,7 @@ void ZeLogger::flush() {
 // Default pattern tokens:
 //   %Y-%m-%d %H:%M:%S.%e  — timestamp with milliseconds
 //   %t                     — thread id (cached thread_local, STB_LOCAL — safe for dlclose)
-//   %P                     — process id (cached at construction)
+//   %P                     — process id
 //   %^%l%$                 — level label (with color when tty)
 //   %v                     — message
 //
@@ -516,16 +519,47 @@ std::shared_ptr<ZeLogger> createLogger(const std::string &caller) {
         logger = std::make_shared<ZeLogger>(/*use_stderr=*/true, level, log_pattern);
         output_dest = "stderr (console)";
     } else {
-        // Create the log directory only if it does not already exist.
+        // Create the full directory path (equivalent to mkdir -p).
 #ifdef _WIN32
-        DWORD attrs = GetFileAttributesA(log_directory.c_str());
-        if (attrs == INVALID_FILE_ATTRIBUTES || !(attrs & FILE_ATTRIBUTE_DIRECTORY)) {
-            _mkdir(log_directory.c_str());
+        // Walk each component and create it if missing.
+        for (std::size_t pos = 0; pos <= log_directory.size(); ++pos) {
+            if (pos == log_directory.size() ||
+                log_directory[pos] == '\\' || log_directory[pos] == '/') {
+                if (pos == 0) continue;
+                std::string partial = log_directory.substr(0, pos);
+                DWORD attrs = GetFileAttributesA(partial.c_str());
+                if (attrs == INVALID_FILE_ATTRIBUTES) {
+                    if (_mkdir(partial.c_str()) != 0 && errno != EEXIST) {
+                        std::cerr << "ze_logger: Failed to create log directory '"
+                                  << partial << "': " << strerror(errno) << "\n";
+                        return std::make_shared<ZeLogger>();
+                    }
+                } else if (!(attrs & FILE_ATTRIBUTE_DIRECTORY)) {
+                    std::cerr << "ze_logger: Log directory path component '"
+                              << partial << "' exists but is not a directory\n";
+                    return std::make_shared<ZeLogger>();
+                }
+            }
         }
 #else
-        struct stat st{};
-        if (stat(log_directory.c_str(), &st) != 0 || !S_ISDIR(st.st_mode)) {
-            mkdir(log_directory.c_str(), 0755);
+        // Walk each component and create it if missing.
+        for (std::size_t pos = 0; pos <= log_directory.size(); ++pos) {
+            if (pos == log_directory.size() || log_directory[pos] == '/') {
+                if (pos == 0) continue;
+                std::string partial = log_directory.substr(0, pos);
+                struct stat st{};
+                if (stat(partial.c_str(), &st) != 0) {
+                    if (mkdir(partial.c_str(), 0755) != 0 && errno != EEXIST) {
+                        std::cerr << "ze_logger: Failed to create log directory '"
+                                  << partial << "': " << strerror(errno) << "\n";
+                        return std::make_shared<ZeLogger>();
+                    }
+                } else if (!S_ISDIR(st.st_mode)) {
+                    std::cerr << "ze_logger: Log directory path component '"
+                              << partial << "' exists but is not a directory\n";
+                    return std::make_shared<ZeLogger>();
+                }
+            }
         }
 #endif
         logger = std::make_shared<ZeLogger>(full_log_file_path, level, log_pattern);