asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #15297 from poke1024/runner-limit-errs

Browse source 
Limit number of errors and messages sent by runner
This commit is contained in:
Rémi Verschelde 2018-01-07 12:38:08 +01:00 committed by GitHub
commit 42ee9541fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
core/script_debugger_remote.cpp
View file

@ -355,6 +355,13 @@ void ScriptDebuggerRemote::_get_output() {
locking = false;
}
if (n_messages_dropped > 0) {
Message msg;
msg.message = "Too many messages! " + String::num_int64(n_messages_dropped) + " messages were dropped.";
messages.push_back(msg);
n_messages_dropped = 0;
}
while (messages.size()) {
locking = true;
packet_peer_stream->put_var("message:" + messages.front()->get().message);
@ -366,6 +373,20 @@ void ScriptDebuggerRemote::_get_output() {
locking = false;
}
if (n_errors_dropped > 0) {
OutputError oe;
oe.error = "TOO_MANY_ERRORS";
oe.error_descr = "Too many errors! " + String::num_int64(n_errors_dropped) + " errors were dropped.";
oe.warning = false;
uint64_t time = OS::get_singleton()->get_ticks_msec();
oe.hr = time / 3600000;
oe.min = (time / 60000) % 60;
oe.sec = (time / 1000) % 60;
oe.msec = time % 1000;
errors.push_back(oe);
n_errors_dropped = 0;
}
while (errors.size()) {
locking = true;
packet_peer_stream->put_var("error");
@ -453,7 +474,11 @@ void ScriptDebuggerRemote::_err_handler(void *ud, const char *p_func, const char
if (!sdr->locking && sdr->tcp_client->is_connected_to_host()) {
sdr->errors.push_back(oe);
if (sdr->errors.size() >= sdr->max_errors_per_frame) {
sdr->n_errors_dropped++;
} else {
sdr->errors.push_back(oe);
}
}
sdr->mutex->unlock();
@ -891,10 +916,14 @@ void ScriptDebuggerRemote::send_message(const String &p_message, const Array &p_
mutex->lock();
if (!locking && tcp_client->is_connected_to_host()) {
Message msg;
msg.message = p_message;
msg.data = p_args;
messages.push_back(msg);
if (messages.size() >= max_messages_per_frame) {
n_messages_dropped++;
} else {
Message msg;
msg.message = p_message;
msg.data = p_args;
messages.push_back(msg);
}
}
mutex->unlock();
}
@ -1011,7 +1040,11 @@ ScriptDebuggerRemote::ScriptDebuggerRemote() :
requested_quit(false),
mutex(Mutex::create()),
max_cps(GLOBAL_GET("network/limits/debugger_stdout/max_chars_per_second")),
max_messages_per_frame(GLOBAL_GET("network/limits/debugger_stdout/max_messages_per_frame")),
max_errors_per_frame(GLOBAL_GET("network/limits/debugger_stdout/max_errors_per_frame")),
char_count(0),
n_messages_dropped(0),
n_errors_dropped(0),
last_msec(0),
msec_count(0),
locking(false),

4
core/script_debugger_remote.h
View file

@ -87,7 +87,11 @@ class ScriptDebuggerRemote : public ScriptDebugger {
List<String> output_strings;
List<Message> messages;
int max_messages_per_frame;
int n_messages_dropped;
List<OutputError> errors;
int max_errors_per_frame;
int n_errors_dropped;
int max_cps;
int char_count;

2
main/main.cpp
View file

@ -665,6 +665,8 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
GLOBAL_DEF("memory/limits/multithreaded_server/rid_pool_prealloc", 60);
GLOBAL_DEF("network/limits/debugger_stdout/max_chars_per_second", 2048);
GLOBAL_DEF("network/limits/debugger_stdout/max_messages_per_frame", 10);
GLOBAL_DEF("network/limits/debugger_stdout/max_errors_per_frame", 10);
if (debug_mode == "remote") {