summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-01-25 02:59:57 +0100
committerGitHub <noreply@github.com>2020-01-25 02:59:57 +0100
commit2b1d66eda3065d3e04ba04053f6fa313d973c7c9 (patch)
treefefb1bfc10a580f3cfabe3aaf52f9f5c57996fe1 /src/common
parentMerge pull request #3344 from ReinUsesLisp/vk-botw (diff)
parentcommon/logging: don't use regex for path trimming (diff)
downloadyuzu-2b1d66eda3065d3e04ba04053f6fa313d973c7c9.tar
yuzu-2b1d66eda3065d3e04ba04053f6fa313d973c7c9.tar.gz
yuzu-2b1d66eda3065d3e04ba04053f6fa313d973c7c9.tar.bz2
yuzu-2b1d66eda3065d3e04ba04053f6fa313d973c7c9.tar.lz
yuzu-2b1d66eda3065d3e04ba04053f6fa313d973c7c9.tar.xz
yuzu-2b1d66eda3065d3e04ba04053f6fa313d973c7c9.tar.zst
yuzu-2b1d66eda3065d3e04ba04053f6fa313d973c7c9.zip
Diffstat (limited to 'src/common')
-rw-r--r--src/common/logging/backend.cpp2
-rw-r--r--src/common/logging/backend.h2
-rw-r--r--src/common/logging/log.h33
-rw-r--r--src/common/string_util.cpp22
4 files changed, 23 insertions, 36 deletions
diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp
index 8f2591d53..04bc3128f 100644
--- a/src/common/logging/backend.cpp
+++ b/src/common/logging/backend.cpp
@@ -120,7 +120,7 @@ private:
duration_cast<std::chrono::microseconds>(steady_clock::now() - time_origin);
entry.log_class = log_class;
entry.log_level = log_level;
- entry.filename = Common::TrimSourcePath(filename);
+ entry.filename = filename;
entry.line_num = line_nr;
entry.function = function;
entry.message = std::move(message);
diff --git a/src/common/logging/backend.h b/src/common/logging/backend.h
index fca0267a1..fc338c70d 100644
--- a/src/common/logging/backend.h
+++ b/src/common/logging/backend.h
@@ -23,7 +23,7 @@ struct Entry {
std::chrono::microseconds timestamp;
Class log_class;
Level log_level;
- std::string filename;
+ const char* filename;
unsigned int line_num;
std::string function;
std::string message;
diff --git a/src/common/logging/log.h b/src/common/logging/log.h
index 259708116..13a4f1e30 100644
--- a/src/common/logging/log.h
+++ b/src/common/logging/log.h
@@ -9,6 +9,15 @@
namespace Log {
+// trims up to and including the last of ../, ..\, src/, src\ in a string
+constexpr const char* TrimSourcePath(std::string_view source) {
+ const auto rfind = [source](const std::string_view match) {
+ return source.rfind(match) == source.npos ? 0 : (source.rfind(match) + match.size());
+ };
+ auto idx = std::max({rfind("src/"), rfind("src\\"), rfind("../"), rfind("..\\")});
+ return source.data() + idx;
+}
+
/// Specifies the severity or level of detail of the log message.
enum class Level : u8 {
Trace, ///< Extremely detailed and repetitive debugging information that is likely to
@@ -141,24 +150,24 @@ void FmtLogMessage(Class log_class, Level log_level, const char* filename, unsig
#ifdef _DEBUG
#define LOG_TRACE(log_class, ...) \
- ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Trace, __FILE__, __LINE__, \
- __func__, __VA_ARGS__)
+ ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Trace, \
+ ::Log::TrimSourcePath(__FILE__), __LINE__, __func__, __VA_ARGS__)
#else
#define LOG_TRACE(log_class, fmt, ...) (void(0))
#endif
#define LOG_DEBUG(log_class, ...) \
- ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Debug, __FILE__, __LINE__, \
- __func__, __VA_ARGS__)
+ ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Debug, \
+ ::Log::TrimSourcePath(__FILE__), __LINE__, __func__, __VA_ARGS__)
#define LOG_INFO(log_class, ...) \
- ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Info, __FILE__, __LINE__, \
- __func__, __VA_ARGS__)
+ ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Info, \
+ ::Log::TrimSourcePath(__FILE__), __LINE__, __func__, __VA_ARGS__)
#define LOG_WARNING(log_class, ...) \
- ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Warning, __FILE__, __LINE__, \
- __func__, __VA_ARGS__)
+ ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Warning, \
+ ::Log::TrimSourcePath(__FILE__), __LINE__, __func__, __VA_ARGS__)
#define LOG_ERROR(log_class, ...) \
- ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Error, __FILE__, __LINE__, \
- __func__, __VA_ARGS__)
+ ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Error, \
+ ::Log::TrimSourcePath(__FILE__), __LINE__, __func__, __VA_ARGS__)
#define LOG_CRITICAL(log_class, ...) \
- ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Critical, __FILE__, __LINE__, \
- __func__, __VA_ARGS__)
+ ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Critical, \
+ ::Log::TrimSourcePath(__FILE__), __LINE__, __func__, __VA_ARGS__)
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp
index 959f278aa..84883a1d3 100644
--- a/src/common/string_util.cpp
+++ b/src/common/string_util.cpp
@@ -223,26 +223,4 @@ std::u16string UTF16StringFromFixedZeroTerminatedBuffer(std::u16string_view buff
return std::u16string(buffer.begin(), buffer.begin() + len);
}
-const char* TrimSourcePath(const char* path, const char* root) {
- const char* p = path;
-
- while (*p != '\0') {
- const char* next_slash = p;
- while (*next_slash != '\0' && *next_slash != '/' && *next_slash != '\\') {
- ++next_slash;
- }
-
- bool is_src = Common::ComparePartialString(p, next_slash, root);
- p = next_slash;
-
- if (*p != '\0') {
- ++p;
- }
- if (is_src) {
- path = p;
- }
- }
- return path;
-}
-
} // namespace Common