From be7f78b632635c51089dc60f5bf178cc5db60350 Mon Sep 17 00:00:00 2001
From: Raquel Medina <raquel.medina@konsulko.com>
Date: Mon, 4 May 2020 10:57:37 +0200
Subject: 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
---
 weather/weather.cpp | 13 ++++++-------
 weather/weather.h   |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'weather')

diff --git a/weather/weather.cpp b/weather/weather.cpp
index 298f32c..d4a8173 100644
--- a/weather/weather.cpp
+++ b/weather/weather.cpp
@@ -21,22 +21,21 @@
 #include "eventmessage.h"
 #include "messagefactory.h"
 #include "messageengine.h"
+#include "messageenginefactory.h"
 #include "weather.h"
 
 
 Weather::Weather (QUrl &url, QObject * parent) :
-	QObject(parent),
-	m_mloop(nullptr)
+	QObject(parent)
 {
-	m_mloop = new MessageEngine(url);
-	QObject::connect(m_mloop, &MessageEngine::connected, this, &Weather::onConnected);
-	QObject::connect(m_mloop, &MessageEngine::disconnected, this, &Weather::onDisconnected);
-	QObject::connect(m_mloop, &MessageEngine::messageReceived, this, &Weather::onMessageReceived);
+	m_mloop = MessageEngineFactory::getInstance().getMessageEngine(url);
+	QObject::connect(m_mloop.get(), &MessageEngine::connected, this, &Weather::onConnected);
+	QObject::connect(m_mloop.get(), &MessageEngine::disconnected, this, &Weather::onDisconnected);
+	QObject::connect(m_mloop.get(), &MessageEngine::messageReceived, this, &Weather::onMessageReceived);
 }
 
 Weather::~Weather()
 {
-	delete m_mloop;
 }
 
 void Weather::onConnected()
diff --git a/weather/weather.h b/weather/weather.h
index 75054d5..93c5ec4 100644
--- a/weather/weather.h
+++ b/weather/weather.h
@@ -41,7 +41,7 @@ class Weather : public QObject
 		void conditionChanged(QString condition);
 
 	private:
-		MessageEngine *m_mloop;
+		std::shared_ptr<MessageEngine> m_mloop;
 		QString m_temperature;
 		QString m_condition;
 
-- 
cgit 1.2.3-korg