ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix empty line logging.

This commit is contained in:
Ben Vanik 2015-09-06 13:34:19 -07:00
parent 790ce8aee1
commit 0133bec11d
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,23 +126,27 @@ class Logger {
std::snprintf(prefix + 3, sizeof(prefix) - 3, "%08" PRIX32 " ", std::snprintf(prefix + 3, sizeof(prefix) - 3, "%08" PRIX32 " ",
line.thread_id); line.thread_id);
fwrite(prefix, 1, sizeof(prefix) - 1, file_); fwrite(prefix, 1, sizeof(prefix) - 1, file_);
if (line.buffer_length) {
// Get access to the line data - which may be split in the ring buffer - // Get access to the line data - which may be split in the ring buffer
// and write it out in parts. // - and write it out in parts.
auto line_range = ring_buffer_.BeginRead(line.buffer_length); auto line_range = ring_buffer_.BeginRead(line.buffer_length);
fwrite(line_range.first, 1, line_range.first_length, file_); fwrite(line_range.first, 1, line_range.first_length, file_);
if (line_range.second_length) { if (line_range.second_length) {
fwrite(line_range.second, 1, line_range.second_length, file_); fwrite(line_range.second, 1, line_range.second_length, file_);
} }
// Always ensure there is a newline. // Always ensure there is a newline.
char last_char = line_range.second char last_char = line_range.second
? line_range.second[line_range.second_length - 1] ? line_range.second[line_range.second_length - 1]
: line_range.first[line_range.first_length - 1]; : line_range.first[line_range.first_length - 1];
if (last_char != '\n') { if (last_char != '\n') {
const char suffix[1] = {'\n'};
fwrite(suffix, 1, sizeof(suffix), file_);
}
ring_buffer_.EndRead(std::move(line_range));
} else {
const char suffix[1] = {'\n'}; const char suffix[1] = {'\n'};
fwrite(suffix, 1, sizeof(suffix), file_); fwrite(suffix, 1, sizeof(suffix), file_);
} }
ring_buffer_.EndRead(std::move(line_range));
} }
mutex_.unlock(); mutex_.unlock();
if (did_write) { if (did_write) {