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 --- signal-composer/signalcomposer.cpp | 13 ++++++------- signal-composer/signalcomposer.h | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'signal-composer') diff --git a/signal-composer/signalcomposer.cpp b/signal-composer/signalcomposer.cpp index 1296162..d10bcc1 100644 --- a/signal-composer/signalcomposer.cpp +++ b/signal-composer/signalcomposer.cpp @@ -20,22 +20,21 @@ #include "eventmessage.h" #include "messagefactory.h" #include "messageengine.h" +#include "messageenginefactory.h" #include "signalcomposer.h" SignalComposer::SignalComposer (QUrl &url, QObject * parent) : - QObject(parent), - m_mloop(nullptr) + QObject(parent) { - m_mloop = new MessageEngine(url); - QObject::connect(m_mloop, &MessageEngine::connected, this, &SignalComposer::onConnected); - QObject::connect(m_mloop, &MessageEngine::disconnected, this, &SignalComposer::onDisconnected); - QObject::connect(m_mloop, &MessageEngine::messageReceived, this, &SignalComposer::onMessageReceived); + m_mloop = MessageEngineFactory::getInstance().getMessageEngine(url); + QObject::connect(m_mloop.get(), &MessageEngine::connected, this, &SignalComposer::onConnected); + QObject::connect(m_mloop.get(), &MessageEngine::disconnected, this, &SignalComposer::onDisconnected); + QObject::connect(m_mloop.get(), &MessageEngine::messageReceived, this, &SignalComposer::onMessageReceived); } SignalComposer::~SignalComposer() { - delete m_mloop; } void SignalComposer::onConnected() diff --git a/signal-composer/signalcomposer.h b/signal-composer/signalcomposer.h index 382b6e9..a18f5a8 100644 --- a/signal-composer/signalcomposer.h +++ b/signal-composer/signalcomposer.h @@ -36,7 +36,7 @@ class SignalComposer : public QObject void signalEvent(QString uid, QString value, QString units, quint64 timestamp); private: - MessageEngine *m_mloop; + std::shared_ptr m_mloop; void onConnected(); void onDisconnected(); -- cgit 1.2.3-korg