dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Increase desync msg ring buffer size, improve DumpDesyncMsgLog format

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-09-17 21:39:34 +01:00
parent 0ce032339e
commit be0ea1b03f
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/debug.cpp
View File

@@ -319,7 +319,7 @@ struct DesyncMsgLogEntry {
: date(_date), date_fract(_date_fract), tick_skip_counter(_tick_skip_counter), msg(msg) { } : date(_date), date_fract(_date_fract), tick_skip_counter(_tick_skip_counter), msg(msg) { }
}; };
static std::array<DesyncMsgLogEntry, 32> desync_msg_log; static std::array<DesyncMsgLogEntry, 64> desync_msg_log;
static unsigned int desync_msg_log_count = 0; static unsigned int desync_msg_log_count = 0;
static unsigned int desync_msg_log_next = 0; static unsigned int desync_msg_log_next = 0;
@@ -334,21 +334,19 @@ char *DumpDesyncMsgLog(char *buffer, const char *last)
if (!desync_msg_log_count) return buffer; if (!desync_msg_log_count) return buffer;
const unsigned int count = min<unsigned int>(desync_msg_log_count, desync_msg_log.size()); const unsigned int count = min<unsigned int>(desync_msg_log_count, desync_msg_log.size());
unsigned int log_index = desync_msg_log_next; unsigned int log_index = (desync_msg_log_next + desync_msg_log.size() - count) % desync_msg_log.size();
unsigned int display_num = desync_msg_log_count - count;
buffer += seprintf(buffer, last, "Desync Msg Log:\n Showing most recent %u of %u messages\n", count, desync_msg_log_count); buffer += seprintf(buffer, last, "Desync Msg Log:\n Showing most recent %u of %u messages\n", count, desync_msg_log_count);
for (unsigned int i = 0 ; i < count; i++) { for (unsigned int i = 0 ; i < count; i++) {
if (log_index > 0) {
log_index--;
} else {
log_index = desync_msg_log.size() - 1;
}
const DesyncMsgLogEntry &entry = desync_msg_log[log_index]; const DesyncMsgLogEntry &entry = desync_msg_log[log_index];
YearMonthDay ymd; YearMonthDay ymd;
ConvertDateToYMD(entry.date, &ymd); ConvertDateToYMD(entry.date, &ymd);
buffer += seprintf(buffer, last, " %2u | %4i-%02i-%02i, %2i, %3i | %s\n", i, ymd.year, ymd.month + 1, ymd.day, entry.date_fract, entry.tick_skip_counter, entry.msg.c_str()); buffer += seprintf(buffer, last, "%5u | %4i-%02i-%02i, %2i, %3i | %s\n", display_num, ymd.year, ymd.month + 1, ymd.day, entry.date_fract, entry.tick_skip_counter, entry.msg.c_str());
log_index = (log_index + 1) % desync_msg_log.size();
display_num++;
} }
buffer += seprintf(buffer, last, "\n"); buffer += seprintf(buffer, last, "\n");
return buffer; return buffer;