share MessageEngine instance

Share MessageEngine instance among clients in the
same process using a common socket (same url).

- add MessageEngineFactory class;
- extend std::unordered_map<> to use QString as
key;
- use std::shared_ptr<MessageEngine> to share
ownership among MessageEngineFactory and the
engine clients;
- force MessagEngine parent object null to avoid
life cycle dependency on a parent;
- protect insertions & deletions in m_calls map;

Also, not directly related but as part of testing
these changes: cleanup on voice to remove
superflous model sorting (there's just one voice
model for alexa voice agent).

Bug-AGL: SPEC-3112
Signed-off-by: Raquel Medina <raquel.medina@konsulko.com>
Change-Id: Ie2304453dc37723dac13d256286eeb85f84ca2ab

1 files changed, 4 insertions, 2 deletions

diff --git a/messageengine.cpp b/messageengine.cpp
index 2633545..42fe95b 100644
--- a/messageengine.cpp
+++ b/messageengine.cpp
@@ -22,8 +22,8 @@
 #include "messageengine.h"
 
 
-MessageEngine::MessageEngine(const QUrl &url, QObject *parent) :
-	QObject(parent),
+MessageEngine::MessageEngine(const QUrl &url) :
+	QObject(Q_NULLPTR),
 	m_callid(0),
 	m_url(url)
 {
@@ -43,6 +43,7 @@ bool MessageEngine::sendMessage(std::unique_ptr<Message> msg)
 	if (forkeeps.isEmpty())
 		return false;
 
+	std::lock_guard<std::mutex> localguard(m_mutex);
 	m_calls.insert(callid, forkeeps);
 
 	return true;
@@ -80,6 +81,7 @@ void MessageEngine::onTextMessageReceived(QString jsonStr)
 	unsigned int callid;
 	if (message->isReply() && message->getCallId(&callid)) {
 		message->setAdditionalData(m_calls[callid]);
+		std::lock_guard<std::mutex> localguard(m_mutex);
 		m_calls.remove(callid);
 	}