Browse Source

Log: Avoid making strings that won't be printed

When we switched to `fmt` for logging, the log functions were
implemented in such a way that the strings were always constructed,
even if log priority was such that they weren't ever logged.
pull/7148/head
Gleb Mazovetskiy 2 years ago
parent
commit
56342126bf
  1. 4
      Source/controls/plrctrls.cpp
  2. 2
      Source/engine/assets.cpp
  3. 2
      Source/utils/log.hpp
  4. 2
      Source/utils/sdl2_to_1_2_backports.cpp

4
Source/controls/plrctrls.cpp

@ -1484,7 +1484,7 @@ std::string_view ControlTypeToString(ControlTypes controlType)
void LogControlDeviceAndModeChange(ControlTypes newControlDevice, ControlTypes newControlMode)
{
if (SDL_LOG_PRIORITY_VERBOSE < SDL_LogGetPriority(SDL_LOG_CATEGORY_APPLICATION))
if (SDL_LogGetPriority(SDL_LOG_CATEGORY_APPLICATION) > SDL_LOG_PRIORITY_VERBOSE)
return;
if (newControlDevice == ControlDevice && newControlMode == ControlMode)
return;
@ -1514,7 +1514,7 @@ std::string_view GamepadTypeToString(GamepadLayout gamepadLayout)
void LogGamepadChange(GamepadLayout newGamepad)
{
if (SDL_LOG_PRIORITY_VERBOSE < SDL_LogGetPriority(SDL_LOG_CATEGORY_APPLICATION))
if (SDL_LogGetPriority(SDL_LOG_CATEGORY_APPLICATION) > SDL_LOG_PRIORITY_VERBOSE)
return;
constexpr auto DebugChange = [](GamepadLayout before, GamepadLayout after) -> std::string {
if (before == after)

2
Source/engine/assets.cpp

@ -41,7 +41,7 @@ char *FindUnpackedMpqFile(char *relativePath)
#else
bool IsDebugLogging()
{
return SDL_LOG_PRIORITY_DEBUG >= SDL_LogGetPriority(SDL_LOG_CATEGORY_APPLICATION);
return SDL_LogGetPriority(SDL_LOG_CATEGORY_APPLICATION) <= SDL_LOG_PRIORITY_DEBUG;
}
SDL_RWops *OpenOptionalRWops(const std::string &path)

2
Source/utils/log.hpp

@ -73,6 +73,7 @@ void Log(std::string_view fmt, Args &&...args)
template <typename... Args>
void LogVerbose(LogCategory category, std::string_view fmt, Args &&...args)
{
if (SDL_LogGetPriority(static_cast<int>(category)) > SDL_LOG_PRIORITY_VERBOSE) return;
auto str = detail::format(fmt, std::forward<Args>(args)...);
SDL_LogVerbose(static_cast<int>(category), "%s", str.c_str());
}
@ -86,6 +87,7 @@ void LogVerbose(std::string_view fmt, Args &&...args)
template <typename... Args>
void LogDebug(LogCategory category, std::string_view fmt, Args &&...args)
{
if (SDL_LogGetPriority(static_cast<int>(category)) > SDL_LOG_PRIORITY_DEBUG) return;
auto str = detail::format(fmt, std::forward<Args>(args)...);
SDL_LogDebug(static_cast<int>(category), "%s", str.c_str());
}

2
Source/utils/sdl2_to_1_2_backports.cpp

@ -168,7 +168,7 @@ void SDL_LogMessage(int category, SDL_LogPriority priority, const char *fmt, ...
void SDL_LogMessageV(int category, SDL_LogPriority priority, const char *fmt, va_list ap)
{
if (static_cast<int>(priority) < 0 || priority >= SDL_NUM_LOG_PRIORITIES || priority < SDL_LogGetPriority(category))
if (static_cast<int>(priority) < 0 || priority >= SDL_NUM_LOG_PRIORITIES || SDL_LogGetPriority(category) > priority)
return;
::devilution::printfInConsole("%s: ", SDL_priority_prefixes[priority]);

Loading…
Cancel
Save