summaryrefslogtreecommitdiffstats
path: root/network/network.cpp
diff options
context:
space:
mode:
authorRaquel Medina <raquel.medina@konsulko.com>2020-05-04 10:57:37 +0200
committerRaquel Medina <raquel.medina@konsulko.com>2020-05-04 11:08:06 +0200
commitbe7f78b632635c51089dc60f5bf178cc5db60350 (patch)
tree37b4d81ad2be449a813491d73c442284a1ac220f /network/network.cpp
parentc34c355242319fcb5fb2385040a4d7f819f0afc6 (diff)
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
Diffstat (limited to 'network/network.cpp')
-rw-r--r--network/network.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/network/network.cpp b/network/network.cpp
index 2472279..46045dc 100644
--- a/network/network.cpp
+++ b/network/network.cpp
@@ -22,27 +22,26 @@
#include "responsemessage.h"
#include "messagefactory.h"
#include "messageengine.h"
+#include "messageenginefactory.h"
#include "networkadapter.h"
#include "network.h"
Network::Network (QUrl &url, QQmlContext *context, QObject * parent) :
- QObject(parent),
- m_mloop(nullptr)
+ QObject(parent)
{
- m_mloop = new MessageEngine(url);
+ m_mloop = MessageEngineFactory::getInstance().getMessageEngine(url);
m_adapters.append(new WifiAdapter(this, context, parent));
- QObject::connect(m_mloop, &MessageEngine::connected, this, &Network::onConnected);
- QObject::connect(m_mloop, &MessageEngine::disconnected, this, &Network::onDisconnected);
- QObject::connect(m_mloop, &MessageEngine::messageReceived, this, &Network::onMessageReceived);
+ QObject::connect(m_mloop.get(), &MessageEngine::connected, this, &Network::onConnected);
+ QObject::connect(m_mloop.get(), &MessageEngine::disconnected, this, &Network::onDisconnected);
+ QObject::connect(m_mloop.get(), &MessageEngine::messageReceived, this, &Network::onMessageReceived);
m_adapters.append(new WiredAdapter(this, context, parent));
}
Network::~Network()
{
- delete m_mloop;
while (!m_adapters.isEmpty())
m_adapters.takeLast();
}