follow mapmatching clients on dbus

rinigus · Jul 19, 2018 · 2bf9924 · 2bf9924
1 parent aa90f44
commit 2bf9924
Show file tree

Hide file tree

Showing 8 changed files with 98 additions and 17 deletions.
diff --git a/osmscout-server_silica.pro b/osmscout-server_silica.pro
@@ -90,7 +90,8 @@ SOURCES += \
     src/util.cpp \
     src/mapboxglmaster.cpp \ 
     src/valhallamapmatcher.cpp \
-    src/valhallamapmatcherdbus.cpp
+    src/valhallamapmatcherdbus.cpp \
+    src/valhallamapmatcherdbusadaptor.cpp
 
 OTHER_FILES += rpm/osmscout-server.spec
 
@@ -122,7 +123,8 @@ HEADERS += \
     src/util.hpp \
     src/mapboxglmaster.h \
     src/valhallamapmatcher.h \
-    src/valhallamapmatcherdbus.h
+    src/valhallamapmatcherdbus.h \
+    src/valhallamapmatcherdbusadaptor.h
 
 use_osmscout {
     DEFINES += USE_OSMSCOUT

diff --git a/pro/osmscout-server_console.pro b/pro/osmscout-server_console.pro
@@ -76,7 +76,8 @@ SOURCES += src/dbmaster.cpp \
     src/mapboxglmaster.cpp \
     src/mapmanager_urlcollection.cpp \
     src/valhallamapmatcher.cpp \
-    src/valhallamapmatcherdbus.cpp
+    src/valhallamapmatcherdbus.cpp \
+    src/valhallamapmatcherdbusadaptor.cpp
 
 OTHER_FILES += \
     osmscout-server.desktop
@@ -107,7 +108,8 @@ HEADERS += \
     src/mapboxglmaster.h \
     src/mapmanager_urlcollection.h \
     src/valhallamapmatcher.h \
-    src/valhallamapmatcherdbus.h
+    src/valhallamapmatcherdbus.h \
+    src/valhallamapmatcherdbusadaptor.h
 
 use_osmscout {
     DEFINES += USE_OSMSCOUT

diff --git a/pro/osmscout-server_qtcontrols.pro b/pro/osmscout-server_qtcontrols.pro
@@ -83,7 +83,8 @@ SOURCES += src/dbmaster.cpp \
     src/util.cpp \
     src/mapboxglmaster.cpp \
     src/valhallamapmatcher.cpp \
-    src/valhallamapmatcherdbus.cpp
+    src/valhallamapmatcherdbus.cpp \
+    src/valhallamapmatcherdbusadaptor.cpp
 
 OTHER_FILES += \
     osmscout-server.desktop
@@ -116,7 +117,8 @@ HEADERS += \
     src/util.hpp \
     src/mapboxglmaster.h \
     src/valhallamapmatcher.h \
-    src/valhallamapmatcherdbus.h
+    src/valhallamapmatcherdbus.h \
+    src/valhallamapmatcherdbusadaptor.h
 
 use_osmscout {
     DEFINES += USE_OSMSCOUT

diff --git a/src/main.cpp b/src/main.cpp
@@ -41,6 +41,7 @@
 
 // DBus interface
 #include "valhallamapmatcherdbus.h"
+#include "valhallamapmatcherdbusadaptor.h"
 
 // LIB OSM Scout interface
 #include "dbmaster.h"
@@ -522,18 +523,21 @@ int main(int argc, char *argv[])
 #endif
 
     // establish d-bus connection
-    QDBusConnection dbussession = QDBusConnection::sessionBus();
+    QDBusConnection dbusconnection = QDBusConnection::sessionBus();
 
     // add d-bus interface
 #ifdef USE_VALHALLA
-    QObject objValhallaMapMatcher; // dummy object used by DBus interface
-    new ValhallaMapMatcherDBus(&objValhallaMapMatcher);
-    if (!dbussession.registerObject(DBUS_PATH_MAPMATCHING, &objValhallaMapMatcher))
+    ValhallaMapMatcherDBus valhallaMapMatcherDBus;
+    new ValhallaMapMatcherDBusAdaptor(&valhallaMapMatcherDBus);
+    if (!dbusconnection.registerObject(DBUS_PATH_MAPMATCHING, &valhallaMapMatcherDBus))
       InfoHub::logWarning(app->tr("Failed to register DBus object: %1").arg(DBUS_PATH_MAPMATCHING));
+    else
+      dbusconnection.connect(QString(), "/org/freedesktop/DBus", "org.freedesktop.DBus", "NameOwnerChanged",
+                             &valhallaMapMatcherDBus, SLOT(onNameOwnerChanged(QString,QString,QString)));
 #endif
 
     // register dbus service
-    if (!dbussession.registerService(DBUS_SERVICE))
+    if (!dbusconnection.registerService(DBUS_SERVICE))
       InfoHub::logWarning(app->tr("Failed to register DBus service: %1").arg(DBUS_SERVICE));
 
     return_code = app->exec();

diff --git a/src/valhallamapmatcherdbus.cpp b/src/valhallamapmatcherdbus.cpp
@@ -1,11 +1,11 @@
 #include "valhallamapmatcherdbus.h"
+#include "infohub.h"
 
 #include <QDebug>
 
 ValhallaMapMatcherDBus::ValhallaMapMatcherDBus(QObject *parent):
-  QDBusAbstractAdaptor(parent)
+  QObject(parent)
 {
-
 }
 
 ValhallaMapMatcherDBus::~ValhallaMapMatcherDBus()
@@ -48,3 +48,13 @@ bool ValhallaMapMatcherDBus::stop(const QDBusMessage &message)
     m_matchers.remove(caller);
   return true;
 }
+
+void ValhallaMapMatcherDBus::onNameOwnerChanged(QString name, QString /*old_owner*/, QString new_owner)
+{
+  if (new_owner.length() < 1 &&
+      m_matchers.contains(name))
+    {
+      InfoHub::logInfo(tr("Closing map matching service for DBus client %1").arg(name));
+      m_matchers.remove(name);
+    }
+}
diff --git a/src/valhallamapmatcherdbus.h b/src/valhallamapmatcherdbus.h
@@ -1,30 +1,35 @@
 #ifndef VALHALLAMAPMATCHERDBUS_H
 #define VALHALLAMAPMATCHERDBUS_H
 
-#include "config.h"
 #include "valhallamapmatcher.h"
 
 #include <QDBusAbstractAdaptor>
+#include <QDBusConnection>
 #include <QDBusMessage>
 #include <QHash>
 #include <QSharedPointer>
 
-class ValhallaMapMatcherDBus : public QDBusAbstractAdaptor
+class ValhallaMapMatcherDBus : public QObject
 {
   Q_OBJECT
-  Q_CLASSINFO("D-Bus Interface", DBUS_INTERFACE_MAPMATCHING)
 
 public:
-  ValhallaMapMatcherDBus(QObject *parent);
+  ValhallaMapMatcherDBus(QObject *parent=nullptr);
   ~ValhallaMapMatcherDBus();
 
 public slots:
+  //////////////////////////////////////////////////////////////////////////////////////////
+  /// NB! when adding slots for DBus export, don't forget to add them in the adaptor as well
+
   QString update(int mode, double lat, double lon, double accuracy, const QDBusMessage &message);
 
   bool reset(int mode, const QDBusMessage &message);
   bool stop(int mode, const QDBusMessage &message);
   bool stop(const QDBusMessage &message);
 
+  // used to track lost clients - not for export on dbus
+  void onNameOwnerChanged(QString name, QString old_owner, QString new_owner);
+
 protected:
   QSharedPointer<ValhallaMapMatcher> get(int mode, const QString &caller);
 

diff --git a/src/valhallamapmatcherdbusadaptor.cpp b/src/valhallamapmatcherdbusadaptor.cpp
@@ -0,0 +1,26 @@
+#include "valhallamapmatcherdbusadaptor.h"
+
+ValhallaMapMatcherDBusAdaptor::ValhallaMapMatcherDBusAdaptor(ValhallaMapMatcherDBus *p):
+  QDBusAbstractAdaptor(p), m(p)
+{
+}
+
+QString ValhallaMapMatcherDBusAdaptor::update(int mode, double lat, double lon, double accuracy, const QDBusMessage &message)
+{
+  return m->update(mode,lat,lon,accuracy,message);
+}
+
+bool ValhallaMapMatcherDBusAdaptor::reset(int mode, const QDBusMessage &message)
+{
+  return m->reset(mode,message);
+}
+
+bool ValhallaMapMatcherDBusAdaptor::stop(int mode, const QDBusMessage &message)
+{
+  return m->stop(mode,message);
+}
+
+bool ValhallaMapMatcherDBusAdaptor::stop(const QDBusMessage &message)
+{
+  return m->stop(message);
+}
diff --git a/src/valhallamapmatcherdbusadaptor.h b/src/valhallamapmatcherdbusadaptor.h
@@ -0,0 +1,30 @@
+#ifndef VALHALLAMAPMATCHERDBUSADAPTOR_H
+#define VALHALLAMAPMATCHERDBUSADAPTOR_H
+
+#include "valhallamapmatcherdbus.h"
+#include "config.h"
+
+#include <QDBusAbstractAdaptor>
+#include <QDBusConnection>
+#include <QDBusMessage>
+
+class ValhallaMapMatcherDBusAdaptor : public QDBusAbstractAdaptor
+{
+  Q_OBJECT
+  Q_CLASSINFO("D-Bus Interface", DBUS_INTERFACE_MAPMATCHING)
+
+public:
+  ValhallaMapMatcherDBusAdaptor(ValhallaMapMatcherDBus *parent);
+
+public slots:
+  QString update(int mode, double lat, double lon, double accuracy, const QDBusMessage &message);
+
+  bool reset(int mode, const QDBusMessage &message);
+  bool stop(int mode, const QDBusMessage &message);
+  bool stop(const QDBusMessage &message);
+
+private:
+  ValhallaMapMatcherDBus *m;
+};
+
+#endif // VALHALLAMAPMATCHERDBUSADAPTOR_H