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 --- navigation/navigation.cpp | 13 ++++++------- navigation/navigation.h | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'navigation') diff --git a/navigation/navigation.cpp b/navigation/navigation.cpp index e0078c2..e24df1a 100644 --- a/navigation/navigation.cpp +++ b/navigation/navigation.cpp @@ -20,22 +20,21 @@ #include "eventmessage.h" #include "messagefactory.h" #include "messageengine.h" +#include "messageenginefactory.h" #include "navigation.h" Navigation::Navigation (QUrl &url, QObject * parent) : - QObject(parent), - m_mloop(nullptr) + QObject(parent) { - m_mloop = new MessageEngine(url); - QObject::connect(m_mloop, &MessageEngine::connected, this, &Navigation::onConnected); - QObject::connect(m_mloop, &MessageEngine::disconnected, this, &Navigation::onDisconnected); - QObject::connect(m_mloop, &MessageEngine::messageReceived, this, &Navigation::onMessageReceived); + m_mloop = MessageEngineFactory::getInstance().getMessageEngine(url); + QObject::connect(m_mloop.get(), &MessageEngine::connected, this, &Navigation::onConnected); + QObject::connect(m_mloop.get(), &MessageEngine::disconnected, this, &Navigation::onDisconnected); + QObject::connect(m_mloop.get(), &MessageEngine::messageReceived, this, &Navigation::onMessageReceived); } Navigation::~Navigation() { - delete m_mloop; } void Navigation::sendWaypoint(double lat, double lon) diff --git a/navigation/navigation.h b/navigation/navigation.h index 87e5636..b1c0412 100644 --- a/navigation/navigation.h +++ b/navigation/navigation.h @@ -46,7 +46,7 @@ class Navigation : public QObject void waypointsEvent(QVariantMap data); private: - MessageEngine *m_mloop; + std::shared_ptr m_mloop; // slots void onMessageReceived(std::shared_ptr msg); -- cgit 1.2.3-korg