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 --- messageengine.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'messageengine.h') diff --git a/messageengine.h b/messageengine.h index b682ec5..4639c97 100644 --- a/messageengine.h +++ b/messageengine.h @@ -19,6 +19,7 @@ #include #include +#include #include #include @@ -28,7 +29,7 @@ class MessageEngine : public QObject { Q_OBJECT public: - explicit MessageEngine(const QUrl &url, QObject *parent = Q_NULLPTR); + explicit MessageEngine(const QUrl &url); bool sendMessage(std::unique_ptr message); Q_SIGNALS: @@ -43,9 +44,11 @@ class MessageEngine : public QObject private: QWebSocket m_websocket; + std::mutex m_mutex; QMap m_calls; QUrl m_url; std::atomic m_callid; + friend class MessageEngineFactory; }; #endif // MESSAGEENGINE_H -- cgit 1.2.3-korg