diff options
author | Lioncash <mathew1800@gmail.com> | 2019-03-02 20:25:50 +0100 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2019-03-02 20:44:24 +0100 |
commit | 43c1092031a7e0ad2ac9f45a651b97ce19102bb6 (patch) | |
tree | 29619034f52f6f4c3587c432e9441df57fb546e3 /src/common/logging/backend.cpp | |
parent | Merge pull request #2183 from ReinUsesLisp/vk-buffer-cache-clang (diff) | |
download | yuzu-43c1092031a7e0ad2ac9f45a651b97ce19102bb6.tar yuzu-43c1092031a7e0ad2ac9f45a651b97ce19102bb6.tar.gz yuzu-43c1092031a7e0ad2ac9f45a651b97ce19102bb6.tar.bz2 yuzu-43c1092031a7e0ad2ac9f45a651b97ce19102bb6.tar.lz yuzu-43c1092031a7e0ad2ac9f45a651b97ce19102bb6.tar.xz yuzu-43c1092031a7e0ad2ac9f45a651b97ce19102bb6.tar.zst yuzu-43c1092031a7e0ad2ac9f45a651b97ce19102bb6.zip |
Diffstat (limited to '')
-rw-r--r-- | src/common/logging/backend.cpp | 51 |
1 files changed, 26 insertions, 25 deletions
diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp index b369f199f..555addb95 100644 --- a/src/common/logging/backend.cpp +++ b/src/common/logging/backend.cpp @@ -39,8 +39,10 @@ public: Impl(Impl const&) = delete; const Impl& operator=(Impl const&) = delete; - void PushEntry(Entry e) { - message_queue.Push(std::move(e)); + void PushEntry(Class log_class, Level log_level, const char* filename, unsigned int line_num, + const char* function, std::string message) { + message_queue.Push( + CreateEntry(log_class, log_level, filename, line_num, function, std::move(message))); } void AddBackend(std::unique_ptr<Backend> backend) { @@ -108,6 +110,26 @@ private: backend_thread.join(); } + Entry CreateEntry(Class log_class, Level log_level, const char* filename, unsigned int line_nr, + const char* function, std::string message) const { + using std::chrono::duration_cast; + using std::chrono::steady_clock; + + static steady_clock::time_point time_origin = steady_clock::now(); + + Entry entry; + entry.timestamp = + 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.line_num = line_nr; + entry.function = function; + entry.message = std::move(message); + + return entry; + } + std::mutex writing_mutex; std::thread backend_thread; std::vector<std::unique_ptr<Backend>> backends; @@ -271,25 +293,6 @@ const char* GetLevelName(Level log_level) { #undef LVL } -Entry CreateEntry(Class log_class, Level log_level, const char* filename, unsigned int line_nr, - const char* function, std::string message) { - using std::chrono::duration_cast; - using std::chrono::steady_clock; - - static steady_clock::time_point time_origin = steady_clock::now(); - - Entry entry; - entry.timestamp = 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.line_num = line_nr; - entry.function = function; - entry.message = std::move(message); - - return entry; -} - void SetGlobalFilter(const Filter& filter) { Impl::Instance().SetGlobalFilter(filter); } @@ -314,9 +317,7 @@ void FmtLogMessageImpl(Class log_class, Level log_level, const char* filename, if (!filter.CheckMessage(log_class, log_level)) return; - Entry entry = - CreateEntry(log_class, log_level, filename, line_num, function, fmt::vformat(format, args)); - - instance.PushEntry(std::move(entry)); + instance.PushEntry(log_class, log_level, filename, line_num, function, + fmt::vformat(format, args)); } } // namespace Log |