summaryrefslogtreecommitdiffstats
path: root/messageenginefactory.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 /messageenginefactory.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 'messageenginefactory.cpp')
-rw-r--r--messageenginefactory.cpp40
1 files changed, 40 insertions, 0 deletions
diff --git a/messageenginefactory.cpp b/messageenginefactory.cpp
new file mode 100644
index 0000000..7a052ce
--- /dev/null
+++ b/messageenginefactory.cpp
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2020 Konsulko Group
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#include <unordered_map>
+#include <mutex>
+#include <QDebug>
+#include <QUrl>
+#include "messageenginefactory.h"
+#include "messageengine.h"
+#include "utils.h"
+
+std::shared_ptr<MessageEngine> MessageEngineFactory::getMessageEngine(const QUrl& url)
+{
+ static std::unordered_map<QString, std::shared_ptr<MessageEngine>> lut;
+ static std::mutex m;
+
+ std::lock_guard<std::mutex> localguard(m);
+ auto urlstr = url.toString();
+ auto pme = lut[urlstr];
+ if (!pme){
+ pme = std::make_shared<MessageEngine>(url);
+ lut[urlstr] = pme;
+ }
+
+ return pme;
+}