Replace logger #955
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,157 @@ | ||
| //===--------------------------------------------------------------------------------*- C++ -*-===// | ||
| // _ | ||
| // | | | ||
| // __| | __ ___ ___ ___ | ||
| // / _` |/ _` \ \ /\ / / '_ | | ||
| // | (_| | (_| |\ V V /| | | | | ||
| // \__,_|\__,_| \_/\_/ |_| |_| - Compiler Toolchain | ||
| // | ||
| // | ||
| // This file is distributed under the MIT License (MIT). | ||
| // See LICENSE.txt for details. | ||
| // | ||
| //===------------------------------------------------------------------------------------------===// | ||
|
|
||
| #include "dawn/Support/Logger.h" | ||
| #include "dawn/Support/Assert.h" | ||
| #include "dawn/Support/FileSystem.h" | ||
| #include "dawn/Support/Format.h" | ||
| #include <chrono> | ||
| #include <iostream> | ||
|
|
||
| namespace dawn { | ||
|
|
||
| Logger::MessageFormatter makeMessageFormatter(const std::string type) { | ||
| return [type](const std::string& msg, const std::string& file, int line) { | ||
| std::stringstream ss; | ||
| ss << "[" << file << ":" << line << "] "; | ||
| if(type != "") | ||
| ss << type << ": "; | ||
| ss << msg; | ||
| return ss.str(); | ||
| }; | ||
| } | ||
|
|
||
| Logger::DiagnosticFormatter makeDiagnosticFormatter(const std::string type) { | ||
| return [type](const std::string& msg, const std::string& file, int line, | ||
| const std::string& source, SourceLocation loc) { | ||
| std::stringstream ss; | ||
| ss << "[" << file << ":" << line << "]"; | ||
| if(source != "") | ||
| ss << " " << source; | ||
| if(loc.Line >= 0) { | ||
| ss << ":" << loc.Line; | ||
| } | ||
| if(loc.Column >= 0) { | ||
| ss << ":" << loc.Column; | ||
| } | ||
| if(type != "") | ||
| ss << ": " << type; | ||
| ss << ": " << msg; | ||
| return ss.str(); | ||
| }; | ||
| } | ||
|
|
||
| MessageProxy::MessageProxy(const MessageProxy& other) | ||
| : logger_(other.logger_), ss_(other.ss_.str()), file_(other.file_), line_(other.line_) {} | ||
|
|
||
| MessageProxy::MessageProxy(Logger& logger, const std::string& file, int line) | ||
| : logger_(logger), file_(file), line_(line) {} | ||
|
|
||
| MessageProxy::~MessageProxy() { logger_.enqueue(ss_.str(), file_, line_); } | ||
|
|
||
| DiagnosticProxy::DiagnosticProxy(const DiagnosticProxy& other) | ||
| : logger_(other.logger_), ss_(other.ss_.str()), file_(other.file_), line_(other.line_), | ||
| source_(other.source_), loc_(other.loc_) {} | ||
|
|
||
| DiagnosticProxy::DiagnosticProxy(Logger& logger, const std::string& file, int line, | ||
| const std::string& source, SourceLocation loc) | ||
| : logger_(logger), file_(file), line_(line), source_(source), loc_(loc) {} | ||
|
|
||
| DiagnosticProxy::~DiagnosticProxy() { logger_.enqueue(ss_.str(), file_, line_, source_, loc_); } | ||
|
|
||
| Logger::Logger(MessageFormatter msgFmt, DiagnosticFormatter diagFmt, std::ostream& os, bool show) | ||
| : msgFmt_(msgFmt), diagFmt_(diagFmt), os_(&os), data_(), show_(show) {} | ||
|
|
||
| MessageProxy Logger::operator()(const std::string& file, int line) { | ||
| return MessageProxy(*this, file, line); | ||
| } | ||
|
|
||
| DiagnosticProxy Logger::operator()(const std::string& file, int line, const std::string& source, | ||
| SourceLocation loc) { | ||
| return DiagnosticProxy(*this, file, line, source, loc); | ||
| } | ||
|
|
||
| void Logger::doEnqueue(const std::string& message) { | ||
| data_.push_back(message); | ||
| if(show_) { | ||
| *os_ << data_.back(); | ||
| if(data_.back().back() != '\n') | ||
| *os_ << '\n'; | ||
| } | ||
| } | ||
|
|
||
| void Logger::enqueue(std::string msg, const std::string& file, int line) { | ||
| doEnqueue(msgFmt_(msg, file, line)); | ||
| } | ||
|
|
||
| void Logger::enqueue(std::string msg, const std::string& file, int line, const std::string& source, | ||
| SourceLocation loc) { | ||
| doEnqueue(diagFmt_(msg, file, line, source, loc)); | ||
| } | ||
|
|
||
| std::ostream& Logger::stream() const { return *os_; } | ||
| void Logger::stream(std::ostream& os) { os_ = &os; } | ||
|
|
||
| Logger::MessageFormatter Logger::messageFormatter() const { return msgFmt_; } | ||
| void Logger::messageFormatter(const MessageFormatter& msgFmt) { msgFmt_ = msgFmt; } | ||
|
|
||
| Logger::DiagnosticFormatter Logger::diagnosticFormatter() const { return diagFmt_; } | ||
| void Logger::diagnosticFormatter(const DiagnosticFormatter& diagFmt) { diagFmt_ = diagFmt; } | ||
|
|
||
| void Logger::clear() { data_.clear(); } | ||
|
|
||
| void Logger::show() { show_ = true; } | ||
| void Logger::hide() { show_ = false; } | ||
|
|
||
| // Expose container of messages | ||
| Logger::iterator Logger::begin() { return std::begin(data_); } | ||
| Logger::iterator Logger::end() { return std::end(data_); } | ||
| Logger::const_iterator Logger::begin() const { return std::begin(data_); } | ||
| Logger::const_iterator Logger::end() const { return std::end(data_); } | ||
| Logger::Container::size_type Logger::size() const { return std::size(data_); } | ||
|
|
||
| namespace log { | ||
|
|
||
| Logger info(makeMessageFormatter("INFO"), makeDiagnosticFormatter("INFO"), std::cout, false); | ||
| Logger warn(makeMessageFormatter("WARNING"), makeDiagnosticFormatter("WARNING"), std::cout, true); | ||
| Logger error(makeMessageFormatter("ERROR"), makeDiagnosticFormatter("ERROR"), std::cerr, true); | ||
|
|
||
| void setVerbosity(Level level) { | ||
| switch(level) { | ||
| case Level::All: | ||
| info.show(); | ||
| warn.show(); | ||
| error.show(); | ||
| break; | ||
| case Level::Warnings: | ||
| info.hide(); | ||
| warn.show(); | ||
| error.show(); | ||
| break; | ||
| case Level::Errors: | ||
| info.hide(); | ||
| warn.hide(); | ||
| error.show(); | ||
| break; | ||
| case Level::None: | ||
| info.hide(); | ||
| warn.hide(); | ||
| error.hide(); | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| } // namespace log | ||
|
|
||
| } // namespace dawn |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here is an example of the diagnostic in code.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is the idea to not switch in this but in a follow up PR?