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

Send network client desync log messages to server

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-04-24 01:15:05 +01:00
parent c14dcdadaf
commit 0d262e4d9a
8 changed files with 71 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/debug.cpp
View File

@@ -313,12 +313,13 @@ struct DesyncMsgLogEntry {
Date date;
DateFract date_fract;
uint8 tick_skip_counter;
uint32 src_id;
std::string msg;
DesyncMsgLogEntry() { }
DesyncMsgLogEntry(std::string msg)
: 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), src_id(0), msg(msg) { }
};
struct DesyncMsgLog {
@@ -332,14 +333,15 @@ struct DesyncMsgLog {
this->next = 0;
}
void LogMsg(std::string msg)
void LogMsg(DesyncMsgLogEntry entry)
{
this->log[this->next] = DesyncMsgLogEntry(std::move(msg));
this->log[this->next] = std::move(entry);
this->next = (this->next + 1) % this->log.size();
this->count++;
}
char *Dump(char *buffer, const char *last)
template <typename F>
char *Dump(char *buffer, const char *last, const char *prefix, F handler)
{
if (!this->count) return buffer;
@@ -347,14 +349,12 @@ struct DesyncMsgLog {
unsigned int log_index = (this->next + this->log.size() - count) % this->log.size();
unsigned int display_num = this->count - count;
buffer += seprintf(buffer, last, "Desync Msg Log:\n Showing most recent %u of %u messages\n", count, this->count);
buffer += seprintf(buffer, last, "%s:\n Showing most recent %u of %u messages\n", prefix, count, this->count);
for (unsigned int i = 0 ; i < count; i++) {
const DesyncMsgLogEntry &entry = this->log[log_index];
YearMonthDay ymd;
ConvertDateToYMD(entry.date, &ymd);
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());
buffer += handler(display_num, buffer, last, entry);
log_index = (log_index + 1) % this->log.size();
display_num++;
}
@@ -364,6 +364,7 @@ struct DesyncMsgLog {
};
static DesyncMsgLog _desync_msg_log;
static DesyncMsgLog _remote_desync_msg_log;
void ClearDesyncMsgLog()
{
@@ -372,11 +373,33 @@ void ClearDesyncMsgLog()
char *DumpDesyncMsgLog(char *buffer, const char *last)
{
buffer = _desync_msg_log.Dump(buffer, last);
buffer = _desync_msg_log.Dump(buffer, last, "Desync Msg Log", [](int display_num, char *buffer, const char *last, const DesyncMsgLogEntry &entry) -> int {
YearMonthDay ymd;
ConvertDateToYMD(entry.date, &ymd);
return 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());
});
buffer = _remote_desync_msg_log.Dump(buffer, last, "Remote Client Desync Msg Log", [](int display_num, char *buffer, const char *last, const DesyncMsgLogEntry &entry) -> int {
YearMonthDay ymd;
ConvertDateToYMD(entry.date, &ymd);
return seprintf(buffer, last, "%5u | Client %5u | %4i-%02i-%02i, %2i, %3i | %s\n", display_num, entry.src_id, ymd.year, ymd.month + 1, ymd.day, entry.date_fract, entry.tick_skip_counter, entry.msg.c_str());
});
return buffer;
}
void LogDesyncMsg(std::string msg)
{
_desync_msg_log.LogMsg(std::move(msg));
if (_networking && !_network_server) {
NetworkClientSendDesyncMsg(msg.c_str());
}
_desync_msg_log.LogMsg(DesyncMsgLogEntry(std::move(msg)));
}
void LogRemoteDesyncMsg(Date date, DateFract date_fract, uint8 tick_skip_counter, uint32 src_id, std::string msg)
{
DesyncMsgLogEntry entry(std::move(msg));
entry.date = date;
entry.date_fract = date_fract;
entry.tick_skip_counter = tick_skip_counter;
entry.src_id = src_id;
_remote_desync_msg_log.LogMsg(std::move(entry));
}