Merge lp:~thomas-voss/location-service/dispatch-ubx-updates-on-runtime into lp:location-service

[Thomas Voß]

Dispatch ubx::Provider via the runtime.

This is a temporary measure until all required interface changes
for supporting out-of-process providers have been released to snapd.

Dispatch ubx::Provider via the runtime.

This is a temporary measure until all required interface changes
for supporting out-of-process providers have been released to snapd.

[Simon Fels (morphis)]

LGTM

review: Approve

=== modified file 'src/location/cmds/run.cpp'
--- src/location/cmds/run.cpp	2017-03-07 10:01:34 +0000
+++ src/location/cmds/run.cpp	2017-03-09 10:09:58 +0000
@@ -70,6 +70,15 @@
             engine->add_provider(std::make_shared<location::providers::dummy::Provider>());
         }
 
+        try
+        {
+            engine->add_provider(location::providers::ubx::Provider::create_instance(ProviderFactory::Configuration{}));
+        }
+        catch (...)
+        {
+            ctxt.cout << "Error adding UBX provider." << std::endl;
+        }
+
         location::dbus::skeleton::Service::Configuration config
         {
             bus,

=== modified file 'src/location/providers/ubx/provider.cpp'
--- src/location/providers/ubx/provider.cpp	2017-03-04 21:43:23 +0000
+++ src/location/providers/ubx/provider.cpp	2017-03-09 10:09:58 +0000
@@ -20,6 +20,7 @@
 
 #include <location/logging.h>
 #include <location/runtime.h>
+#include <location/glib/runtime.h>
 
 #include <core/posix/this_process.h>
 
@@ -72,7 +73,10 @@
         if (gga.hdop)
             position.accuracy().horizontal(gga.hdop.get() * 3. * units::meters);
 
-        provider->updates.position(location::Update<location::Position>{position});
+        glib::Runtime::instance()->dispatch([this, position]()
+        {
+            provider->updates.position(location::Update<location::Position>{position});
+        });
     }
 }
 
@@ -103,14 +107,17 @@
 
 void ubx::Provider::Monitor::operator()(const _8::nmea::Vtg& vtg) const
 {
-    if (vtg.cog_true)
-        provider->updates.heading(
-                    Update<units::Degrees>(
-                        vtg.cog_true.get() * units::degrees));
-    if (vtg.sog_kmh)
-        provider->updates.velocity(
-                    Update<units::MetersPerSecond>(
-                        vtg.sog_kmh.get() * 1000./3600. * units::meters_per_second));
+    glib::Runtime::instance()->dispatch([this, vtg]()
+    {
+        if (vtg.cog_true)
+            provider->updates.heading(
+                        Update<units::Degrees>(
+                            vtg.cog_true.get() * units::degrees));
+        if (vtg.sog_kmh)
+            provider->updates.velocity(
+                        Update<units::MetersPerSecond>(
+                            vtg.sog_kmh.get() * 1000./3600. * units::meters_per_second));
+    });
 }
 
 location::Provider::Ptr ubx::Provider::create_instance(const location::ProviderFactory::Configuration& config)
@@ -127,7 +134,7 @@
     : runtime{location::Runtime::create(1)},
       monitor{std::make_shared<Monitor>(this)},
       receiver{_8::SerialPortReceiver::create(runtime->service(), device, monitor)}
-{
+{   
     runtime->start();
 }