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
---
 bluetooth/bluetooth.cpp | 13 ++++++-------
 bluetooth/bluetooth.h   |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'bluetooth')

diff --git a/bluetooth/bluetooth.cpp b/bluetooth/bluetooth.cpp
index e39270a..cea89ad 100644
--- a/bluetooth/bluetooth.cpp
+++ b/bluetooth/bluetooth.cpp
@@ -21,20 +21,20 @@
 #include "responsemessage.h"
 #include "messagefactory.h"
 #include "messageengine.h"
+#include "messageenginefactory.h"
 #include "bluetooth.h"
 #include "bluetoothmodel.h"
 
 
 Bluetooth::Bluetooth (QUrl &url, QQmlContext *context, QObject * parent) :
     QObject(parent),
-    m_context(context),
-    m_mloop(nullptr)
+    m_context(context)
 {
-    m_mloop = new MessageEngine(url);
+    m_mloop = MessageEngineFactory::getInstance().getMessageEngine(url);
     m_bluetooth = new BluetoothModel();
-    QObject::connect(m_mloop, &MessageEngine::connected, this, &Bluetooth::onConnected);
-    QObject::connect(m_mloop, &MessageEngine::disconnected, this, &Bluetooth::onDisconnected);
-    QObject::connect(m_mloop, &MessageEngine::messageReceived, this, &Bluetooth::onMessageReceived);
+    QObject::connect(m_mloop.get(), &MessageEngine::connected, this, &Bluetooth::onConnected);
+    QObject::connect(m_mloop.get(), &MessageEngine::disconnected, this, &Bluetooth::onDisconnected);
+    QObject::connect(m_mloop.get(), &MessageEngine::messageReceived, this, &Bluetooth::onMessageReceived);
 
     BluetoothModelFilter *m_model = new BluetoothModelFilter();
     m_model->setSourceModel(m_bluetooth);
@@ -53,7 +53,6 @@ Bluetooth::Bluetooth (QUrl &url, QQmlContext *context, QObject * parent) :
 
 Bluetooth::~Bluetooth()
 {
-    delete m_mloop;
 }
 
 void Bluetooth::send_command(QString verb, QJsonObject parameter)
diff --git a/bluetooth/bluetooth.h b/bluetooth/bluetooth.h
index 3953fe6..b79e8f9 100644
--- a/bluetooth/bluetooth.h
+++ b/bluetooth/bluetooth.h
@@ -66,7 +66,7 @@ class Bluetooth : public QObject
         void requestConfirmationEvent(QJsonObject data);
 
     private:
-        MessageEngine *m_mloop;
+        std::shared_ptr<MessageEngine> m_mloop;
         QQmlContext *m_context;
         BluetoothModel *m_bluetooth;
         void send_command(QString, QJsonObject);
-- 
cgit 1.2.3-korg