fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Base/Win] Add cvars to enable a console window to be shown with xenia

Browse Source
This commit is contained in:
Satori
2020-09-07 12:22:23 +01:00
committed by Rick Gibbed
parent 42b10209fe
commit 446837edb1
2 changed files with 26 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/xenia/base/logging.cc
View File

@@ -36,10 +36,8 @@
#include "third_party/fmt/include/fmt/format.h"
DEFINE_path(
log_file, "",
"Logs are written to the given file (specify stdout for command line)",
"Logging");
DEFINE_path(log_file, "", "Logs are written to the given file", "Logging");
DEFINE_bool(log_to_stdout, false, "Write log output to stdout", "Logging");
DEFINE_bool(log_to_debugprint, false, "Dump the log to DebugPrint.", "Logging");
DEFINE_bool(flush_log, true, "Flush log file after each log line batch.",
"Logging");
@@ -66,10 +64,8 @@ struct LogLine {
thread_local char thread_log_buffer_[64 * 1024];
void FileLogSink::Write(const char* buf, size_t size) {
if (file_) {
fwrite(buf, 1, size, file_);
}
}
@@ -82,15 +78,12 @@ void FileLogSink::Flush() {
class Logger {
public:
explicit Logger(const std::string_view app_name)
:
wait_strategy_(),
: wait_strategy_(),
claim_strategy_(kBlockCount, wait_strategy_),
consumed_(wait_strategy_),
running_(true) {
claim_strategy_.add_claim_barrier(consumed_);
write_thread_ =
xe::threading::Thread::Create({}, [this]() { WriteThread(); });
write_thread_->set_name("Logging Writer");
@@ -296,25 +289,26 @@ void InitializeLogging(const std::string_view app_name) {
auto mem = memory::AlignedAlloc<Logger>(0x10);
logger_ = new (mem) Logger(app_name);
FILE* file = nullptr;
FILE* log_file = nullptr;
if (cvars::log_file.empty()) {
if (cvars::log_file.empty()) {
// Default to app name.
auto file_name = fmt::format("{}.log", app_name);
auto file_path = std::filesystem::path(file_name);
xe::filesystem::CreateParentFolder(file_path);
file = xe::filesystem::OpenFile(file_path, "wt");
log_file = xe::filesystem::OpenFile(file_path, "wt");
} else {
if (cvars::log_file == "stdout") {
file = stdout;
} else {
xe::filesystem::CreateParentFolder(cvars::log_file);
file = xe::filesystem::OpenFile(cvars::log_file, "wt");
}
xe::filesystem::CreateParentFolder(cvars::log_file);
log_file = xe::filesystem::OpenFile(cvars::log_file, "wt");
}
auto sink = std::make_unique<FileLogSink>(file);
auto sink = std::make_unique<FileLogSink>(log_file);
logger_->AddLogSink(std::move(sink));
if (cvars::log_to_stdout) {
auto stdout_sink = std::make_unique<FileLogSink>(stdout);
logger_->AddLogSink(std::move(stdout_sink));
}
}
void ShutdownLogging() {