godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-13 13:31:48 +00:00
Code Releases Wiki Activity

Make MessageQueue::flush() reentrant

Browse Source
This commit is contained in:
Pedro J. Estébanez
2017-05-18 13:01:12 +02:00
parent 9fa4f1c54c
commit 983fd3a7bb
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/message_queue.cpp
View File

@@ -318,12 +318,19 @@ void MessageQueue::flush() {
while (read_pos < buffer_end) { while (read_pos < buffer_end) {
_THREAD_SAFE_UNLOCK_
//lock on each interation, so a call can re-add itself to the message queue //lock on each interation, so a call can re-add itself to the message queue
Message *message = (Message *)&buffer[read_pos]; Message *message = (Message *)&buffer[read_pos];
uint32_t advance = sizeof(Message);
if ((message->type & FLAG_MASK) != TYPE_NOTIFICATION)
advance += sizeof(Variant) * message->args;
//pre-advance so this function is reentrant
read_pos += advance;
_THREAD_SAFE_UNLOCK_
Object *target = ObjectDB::get_instance(message->instance_ID); Object *target = ObjectDB::get_instance(message->instance_ID);
if (target != NULL) { if (target != NULL) {
@@ -359,13 +366,9 @@ void MessageQueue::flush() {
} }
} }
uint32_t advance = sizeof(Message);
if ((message->type & FLAG_MASK) != TYPE_NOTIFICATION)
advance += sizeof(Variant) * message->args;
message->~Message(); message->~Message();
_THREAD_SAFE_LOCK_ _THREAD_SAFE_LOCK_
read_pos += advance;
} }
buffer_end = 0; // reset buffer buffer_end = 0; // reset buffer