From 4e3503ea6cf30c55a2cc86f78c4a607bd14f1c41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Fri, 16 Oct 2015 13:53:43 +0200
Subject: [core] do not use std::atomic_* with shared_ptrs

It's not implemented in GCC 4.9.2's stdlib (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57250). Instead, we're now always using a mutex to protect access; we previously created a mutex only on cancelation, but since we're always canceling now, it makes sense to allocate it right away.
---
 include/mbgl/storage/request.hpp |  8 +++----
 src/mbgl/storage/request.cpp     | 51 ++++++++++++++++++++--------------------
 2 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/include/mbgl/storage/request.hpp b/include/mbgl/storage/request.hpp
index 4b75f23f6e..1fb15c5a92 100644
--- a/include/mbgl/storage/request.hpp
+++ b/include/mbgl/storage/request.hpp
@@ -33,13 +33,13 @@ public:
 
 private:
     ~Request();
-    void invoke();
     void notifyCallback();
 
 private:
-    std::unique_ptr<uv::async> async;
-    struct Canceled;
-    std::unique_ptr<Canceled> canceled;
+    std::mutex mtx;
+    bool canceled = false;
+    bool confirmed = false;
+    const std::unique_ptr<uv::async> async;
     Callback callback;
     std::shared_ptr<const Response> response;
 
diff --git a/src/mbgl/storage/request.cpp b/src/mbgl/storage/request.cpp
index 55913846cf..5ed9278d0a 100644
--- a/src/mbgl/storage/request.cpp
+++ b/src/mbgl/storage/request.cpp
@@ -6,12 +6,10 @@
 
 #include <cassert>
 #include <functional>
-#include <atomic>
+#include <memory>
 
 namespace mbgl {
 
-struct Request::Canceled { std::mutex mutex; bool confirmed = false; };
-
 // Note: This requires that loop is running in the current thread (or not yet running).
 Request::Request(const Resource &resource_, uv_loop_t *loop, Callback callback_)
     : async(std::make_unique<uv::async>(loop, [this] { notifyCallback(); })),
@@ -21,56 +19,57 @@ Request::Request(const Resource &resource_, uv_loop_t *loop, Callback callback_)
 
 // Called in the originating thread.
 void Request::notifyCallback() {
+    std::unique_lock<std::mutex> lock(mtx);
     if (!canceled) {
-        invoke();
-    } else {
-        bool destroy = false;
-        {
-            std::unique_lock<std::mutex> lock(canceled->mutex);
-            destroy = canceled->confirmed;
+        // Move the response object out so that we can't accidentally notify twice.
+        auto res = std::move(response);
+        assert(!response);
+        // Unlock before, since callbacks may call cancel, which also locks this mutex.
+        lock.unlock();
+        // The user could supply a null pointer or empty std::function as a callback. In this case, we
+        // still do the file request, but we don't need to deliver a result.
+        // Similarly, two consecutive updates could trigger two notifyCallbacks, so we need to make
+        // sure
+        if (callback && res) {
+            callback(*res);
         }
+    } else {
         // Don't delete right way, because we have to unlock the mutex before deleting.
-        if (destroy) {
+        if (confirmed) {
+            lock.unlock();
             delete this;
         }
     }
 }
 
-void Request::invoke() {
-    assert(response);
-    // The user could supply a null pointer or empty std::function as a callback. In this case, we
-    // still do the file request, but we don't need to deliver a result.
-    if (callback) {
-        callback(*std::atomic_load(&response));
-    }
-}
-
 Request::~Request() = default;
 
 // Called in the FileSource thread.
 void Request::notify(const std::shared_ptr<const Response> &response_) {
+    std::lock_guard<std::mutex> lock(mtx);
     assert(response_);
-    std::atomic_store(&response, response_);
+    response = response_;
     async->send();
 }
 
 // Called in the originating thread.
 void Request::cancel() {
-    assert(async);
+    std::lock_guard<std::mutex> lock(mtx);
     assert(!canceled);
-    canceled = std::make_unique<Canceled>();
+    canceled = true;
 }
 
 
 // Called in the FileSource thread.
 // Will only ever be invoked after cancel() was called in the original requesting thread.
 void Request::destruct() {
-    assert(async);
+    std::lock_guard<std::mutex> lock(mtx);
     assert(canceled);
-    std::unique_lock<std::mutex> lock(canceled->mutex);
-    canceled->confirmed = true;
+    confirmed = true;
+    // We need to extend the lock until after the async has been sent, otherwise the requesting
+    // thread could destroy the async while this call is still in progress.
     async->send();
-    // after this method returns, the FileSource thread has no knowledge of
+    // After this method returns, the FileSource thread has no knowledge of
     // this object anymore.
 }
 
-- 
cgit v1.2.1