Merge lp:~thomas-voss/location-service/fix-1240878 into lp:location-service/trunk

[Thomas Voß]

 * Fix a race when a session is created while another one ends.
 * Ensure a sensible minimum interval between consecutive location updates in the GPS provider.

 * Fix a race when a session is created while another one ends.
 * Ensure a sensible minimum interval between consecutive location updates in the GPS provider.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:49
http://jenkins.qa.ubuntu.com/job/location-service-ci/45/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-saucy-amd64-ci/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-saucy-armhf-ci/36
        deb: http://jenkins.qa.ubuntu.com/job/location-service-saucy-armhf-ci/36/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-saucy-i386-ci/36

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/location-service-ci/45/rebuild

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

Those changes are apparently not enough to fix bug #1240878.
However from a quick scan of the diff they look reasonable, so I’m fine with them if you think they can improve the general situation.

review: Approve

=== modified file 'src/location_service/com/ubuntu/location/providers/gps/provider.cpp'
--- src/location_service/com/ubuntu/location/providers/gps/provider.cpp	2013-08-23 13:50:56 +0000
+++ src/location_service/com/ubuntu/location/providers/gps/provider.cpp	2013-10-17 10:38:06 +0000
@@ -183,6 +183,19 @@
     d->gps_params.context = this;
     
     d->gps_handle = u_hardware_gps_new(std::addressof(d->gps_params));
+
+    static const std::chrono::milliseconds minimum_interval{500};
+    static const uint32_t preferred_accuracy{0};
+    static const uint32_t preferred_time_to_first_fix{0};
+
+    u_hardware_gps_set_position_mode(
+                d->gps_handle,
+                U_HARDWARE_GPS_POSITION_MODE_MS_BASED,
+                U_HARDWARE_GPS_POSITION_RECURRENCE_PERIODIC,
+                minimum_interval.count(),
+                preferred_accuracy,
+                preferred_time_to_first_fix
+                );
 }
 
 culg::Provider::~Provider() noexcept

=== modified file 'src/location_service/com/ubuntu/location/service/skeleton.cpp'
--- src/location_service/com/ubuntu/location/service/skeleton.cpp	2013-06-10 11:10:00 +0000
+++ src/location_service/com/ubuntu/location/service/skeleton.cpp	2013-10-17 10:38:06 +0000
@@ -198,17 +198,21 @@
 	auto service = dbus::Service::use_service(parent->access_bus(), dbus_message_get_sender(msg));
 	auto object = service->object_for_path(session->path());
 
-	auto wrapper = SessionWrapper::Ptr{new SessionWrapper{shared_from_this(), session, service, object}};
-
-	auto reply = dbus::Message::make_method_return(msg);
-	reply->writer() << session->path();
-	parent->access_bus()->send(reply->get());
-
-	bool inserted = false;
-	std::tie(std::ignore, inserted) = session_store.insert(std::make_pair(session->path(), wrapper));
-
-	if (!inserted)
-	    throw std::runtime_error("Could not insert duplicate session into store.");
+    {
+        std::lock_guard<std::mutex> lg(guard);
+
+        auto wrapper = SessionWrapper::Ptr{new SessionWrapper{shared_from_this(), session, service, object}};
+
+        auto reply = dbus::Message::make_method_return(msg);
+        reply->writer() << session->path();
+        parent->access_bus()->send(reply->get());
+
+        bool inserted = false;
+        std::tie(std::ignore, inserted) = session_store.insert(std::make_pair(session->path(), wrapper));
+
+        if (!inserted)
+            throw std::runtime_error("Could not insert duplicate session into store.");
+    }
 
     } catch(const std::runtime_error& e)
     {