From be7f78b632635c51089dc60f5bf178cc5db60350 Mon Sep 17 00:00:00 2001 From: Raquel Medina 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 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 Change-Id: Ie2304453dc37723dac13d256286eeb85f84ca2ab --- map/map.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'map/map.cpp') diff --git a/map/map.cpp b/map/map.cpp index e7a4157..b85a323 100644 --- a/map/map.cpp +++ b/map/map.cpp @@ -21,21 +21,20 @@ #include "responsemessage.h" #include "messagefactory.h" #include "messageengine.h" +#include "messageenginefactory.h" #include "map.h" Map::Map (QUrl &url, QObject * parent) : - QObject(parent), - m_mloop(nullptr) + QObject(parent) { - m_mloop = new MessageEngine(url); - QObject::connect(m_mloop, &MessageEngine::connected, this, &Map::onConnected); - QObject::connect(m_mloop, &MessageEngine::disconnected, this, &Map::onDisconnected); - QObject::connect(m_mloop, &MessageEngine::messageReceived, this, &Map::onMessageReceived); + m_mloop = MessageEngineFactory::getInstance().getMessageEngine(url); + QObject::connect(m_mloop.get(), &MessageEngine::connected, this, &Map::onConnected); + QObject::connect(m_mloop.get(), &MessageEngine::disconnected, this, &Map::onDisconnected); + QObject::connect(m_mloop.get(), &MessageEngine::messageReceived, this, &Map::onMessageReceived); } Map::~Map() { - delete m_mloop; } void Map::compose(QString recipient, QString message) -- cgit 1.2.3-korg