From b524b40fdc5325c840192ce92dbed8108ccef2d9 Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Sat, 6 Jun 2015 22:06:58 -0300
Subject: -fixed many memory initialization issues -fixed deadlock on previews
 thread -fixed compilation errors on unix

---
 core/message_queue.cpp | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'core/message_queue.cpp')

diff --git a/core/message_queue.cpp b/core/message_queue.cpp
index cfbdb37b88..489939ee65 100644
--- a/core/message_queue.cpp
+++ b/core/message_queue.cpp
@@ -324,6 +324,7 @@ int MessageQueue::get_max_buffer_usage() const {
 
 void MessageQueue::flush() {
 
+
 	if (buffer_max_used<buffer_end); {
 		buffer_max_used=buffer_end;
 		//statistics();
@@ -331,9 +332,14 @@ void MessageQueue::flush() {
 
 	uint32_t read_pos=0;
 
-	while (read_pos < buffer_end ) {
+	//using reverse locking strategy
+	_THREAD_SAFE_LOCK_
+
+	while (read_pos<buffer_end) {
+
+		_THREAD_SAFE_UNLOCK_
+
 		//lock on each interation, so a call can re-add itself to the message queue
-		_THREAD_SAFE_LOCK_
 
 		Message *message = (Message*)&buffer[ read_pos ];
 
@@ -379,16 +385,17 @@ void MessageQueue::flush() {
 
 		}
 
-		read_pos+=sizeof(Message);
+		uint32_t advance = sizeof(Message);
 		if (message->type!=TYPE_NOTIFICATION)
-			read_pos+=sizeof(Variant)*message->args;
+			advance+=sizeof(Variant)*message->args;
 		message->~Message();
 
-		_THREAD_SAFE_UNLOCK_
+		_THREAD_SAFE_LOCK_
+		read_pos+=advance;
 
 	}
 
-	_THREAD_SAFE_LOCK_
+
 	buffer_end=0; // reset buffer
 	_THREAD_SAFE_UNLOCK_
 
-- 
cgit v1.2.3