diff options
author | Juan Linietsky <reduzio@gmail.com> | 2019-01-14 10:59:28 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2019-01-14 11:00:05 -0300 |
commit | 4bb0080b3df28a3003bfffd6285602664a4279c9 (patch) | |
tree | 5d73152adb5a1cae699fcbbceb2d79355378ac75 /core | |
parent | c6b587636b1e3cf27e566e6e5b10859316cbefb6 (diff) |
Do not allow adding tasks while in the middle of flushing a message queue
Diffstat (limited to 'core')
-rw-r--r-- | core/message_queue.cpp | 9 | ||||
-rw-r--r-- | core/message_queue.h | 4 |
2 files changed, 13 insertions, 0 deletions
diff --git a/core/message_queue.cpp b/core/message_queue.cpp index 7c3bdfec53..27da2c099a 100644 --- a/core/message_queue.cpp +++ b/core/message_queue.cpp @@ -271,6 +271,8 @@ void MessageQueue::flush() { //using reverse locking strategy _THREAD_SAFE_LOCK_ + flushing = true; + while (read_pos < buffer_end) { //lock on each iteration, so a call can re-add itself to the message queue @@ -327,13 +329,20 @@ void MessageQueue::flush() { } buffer_end = 0; // reset buffer + flushing = false; _THREAD_SAFE_UNLOCK_ } +bool MessageQueue::is_flushing() const { + + return flushing; +} + MessageQueue::MessageQueue() { ERR_FAIL_COND(singleton != NULL); singleton = this; + flushing = false; buffer_end = 0; buffer_max_used = 0; diff --git a/core/message_queue.h b/core/message_queue.h index 696b8e2997..2515eb4a98 100644 --- a/core/message_queue.h +++ b/core/message_queue.h @@ -72,6 +72,8 @@ class MessageQueue { static MessageQueue *singleton; + bool flushing; + public: static MessageQueue *get_singleton(); @@ -87,6 +89,8 @@ public: void statistics(); void flush(); + bool is_flushing() const; + int get_max_buffer_usage() const; MessageQueue(); |