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

[Thomas Voß]

Make sure we always hand a lock owning its mutex to on_access_point_added.

Make sure we always hand a lock owning its mutex to on_access_point_added.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:196
http://jenkins.qa.ubuntu.com/job/location-service-ci/382/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/54
        deb: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/54/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/54

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/382/rebuild

review: Approve (continuous-integration)

[lp:~thomas-voss/location-service/fix-1426307]

197. By Thomas Voß on 2015-05-28

Translate timestamps.

198. By Thomas Voß on 2015-05-28

Add comment explaining timestamp translation.

199. By Thomas Voß on 2015-05-28

btime in /proc/stat is seconds since epoch.

[Manuel de la Peña (mandel)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:199
http://jenkins.qa.ubuntu.com/job/location-service-ci/385/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/57/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/57
        deb: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/57/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/57/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/385/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'src/location_service/com/ubuntu/location/connectivity/cached_wireless_network.cpp'
--- src/location_service/com/ubuntu/location/connectivity/cached_wireless_network.cpp	2014-08-14 20:33:37 +0000
+++ src/location_service/com/ubuntu/location/connectivity/cached_wireless_network.cpp	2015-05-28 10:57:45 +0000
@@ -18,6 +18,10 @@
 
 #include <com/ubuntu/location/connectivity/cached_wireless_network.h>
 
+#include <fstream>
+#include <sstream>
+#include <string>
+
 namespace connectivity = com::ubuntu::location::connectivity;
 
 namespace
@@ -50,6 +54,39 @@
 
     return mode;
 }
+
+// boot_time returns the time since the epoch when the system booted.
+std::chrono::system_clock::time_point boot_time()
+{
+    std::ifstream in{"/proc/stat"};
+    std::string line;
+
+    while (std::getline(in, line))
+    {
+        if (line.empty())
+            continue;
+
+        std::stringstream ss{line};
+        std::string name; ss >> name;
+
+        if (name != "btime")
+            continue;
+
+        std::uint64_t ts; ss >> ts;
+        return std::chrono::system_clock::time_point{std::chrono::seconds{ts}};
+    }
+
+    // Fallback to the best estimate we can give.
+    return std::chrono::system_clock::now();
+}
+
+// NetworkManager reports AP LastSeen timestamps in seconds since boot. We map that back to the epoch
+// to keep dependent software working.
+std::chrono::system_clock::time_point translate_time_stamp(std::uint64_t ts)
+{
+    static const auto ts_when_booted = boot_time();
+    return ts_when_booted + std::chrono::seconds{ts};
+}
 }
 
 const core::Property<std::chrono::system_clock::time_point>& detail::CachedWirelessNetwork::last_seen() const
@@ -88,10 +125,7 @@
     : device_(device),
       access_point_(ap)
 {
-    last_seen_ = std::chrono::system_clock::time_point
-    {
-        std::chrono::system_clock::duration{access_point_.last_seen->get()}
-    };
+    last_seen_ = translate_time_stamp(access_point_.last_seen->get());
 
     bssid_ = access_point_.hw_address->get();
     ssid_ = utf8_ssid_to_string(access_point_.ssid->get());
@@ -162,13 +196,8 @@
             org::freedesktop::NetworkManager::AccessPoint::LastSeen::name(),
             [](CachedWirelessNetwork& thiz, const core::dbus::types::Variant& value)
             {
-                thiz.last_seen_ = std::chrono::system_clock::time_point
-                {
-                    std::chrono::system_clock::duration
-                    {
-                        value.as<org::freedesktop::NetworkManager::AccessPoint::LastSeen::ValueType>()
-                    }
-                };
+                thiz.last_seen_ = translate_time_stamp(
+                    value.as<org::freedesktop::NetworkManager::AccessPoint::LastSeen::ValueType>());
             }
         }
     };

=== modified file 'src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.cpp'
--- src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.cpp	2015-04-27 15:44:40 +0000
+++ src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.cpp	2015-05-28 10:57:45 +0000
@@ -530,6 +530,10 @@
         {
             try
             {
+                // We have to make sure that we always hand in a lock that owns the mutex.
+                if (not ul.owns_lock())
+                    ul.lock();
+
                 on_access_point_added(path, device_path, ul);
             }
             catch (const std::exception& e)