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

Removing copy to temp buffer in log flush.

Browse Source
This commit is contained in:
Ben Vanik
2015-09-06 10:28:17 -07:00
parent 9ae807e56e
commit e48c3534cc
3 changed files with 47 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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