[core] Expose fewer RunLoop implementation details in header

This commit is contained in:
John Firebaugh
2015-11-18 17:40:26 -08:00
committed by Thiago Marcos P. Santos
parent f2553fff89
commit 1c63f98f6d
4 changed files with 26 additions and 24 deletions

View File

@@ -1,11 +1,9 @@
#ifndef MBGL_UTIL_RUN_LOOP
#define MBGL_UTIL_RUN_LOOP
#include <mbgl/util/async_task.hpp>
#include <mbgl/util/noncopyable.hpp>
#include <mbgl/util/work_task.hpp>
#include <mbgl/util/work_request.hpp>
#include <mbgl/util/uv.hpp>
#include <functional>
#include <utility>
@@ -28,10 +26,7 @@ public:
RunLoop(Type type = Type::Default);
~RunLoop();
static RunLoop* Get() {
return current.get();
}
static RunLoop* Get();
static LOOP_HANDLE getLoopHandle();
void run();
@@ -46,8 +41,7 @@ public:
std::move(fn),
std::move(tuple));
withMutex([&] { queue.push(task); });
async->send();
push(task);
}
// Post the cancellable work fn(args...) to this RunLoop.
@@ -63,8 +57,7 @@ public:
std::move(tuple),
flag);
withMutex([&] { queue.push(task); });
async->send();
push(task);
return std::make_unique<WorkRequest>(task);
}
@@ -81,7 +74,7 @@ public:
// because if the request was cancelled, then R might have been destroyed. L2 needs to check
// the flag because the request may have been cancelled after L2 was invoked but before it
// began executing.
auto after = [flag, current = RunLoop::current.get(), callback1 = std::move(callback)] (auto&&... results1) {
auto after = [flag, current = RunLoop::Get(), callback1 = std::move(callback)] (auto&&... results1) {
if (!*flag) {
current->invoke([flag, callback2 = std::move(callback1)] (auto&&... results2) {
if (!*flag) {
@@ -97,8 +90,7 @@ public:
std::move(tuple),
flag);
withMutex([&] { queue.push(task); });
async->send();
push(task);
return std::make_unique<WorkRequest>(task);
}
@@ -149,6 +141,8 @@ private:
using Queue = std::queue<std::shared_ptr<WorkTask>>;
void push(std::shared_ptr<WorkTask>);
void withMutex(std::function<void()>&& fn) {
std::lock_guard<std::mutex> lock(mutex);
fn();
@@ -166,12 +160,9 @@ private:
Queue queue;
std::mutex mutex;
std::unique_ptr<AsyncTask> async;
class Impl;
std::unique_ptr<Impl> impl;
static uv::tls<RunLoop> current;
};
}

View File

@@ -9,9 +9,9 @@
#include <mbgl/util/run_loop.hpp>
#include <mbgl/util/string.hpp>
#include <mbgl/util/timer.hpp>
#include <mbgl/util/uv.hpp>
#include <curl/curl.h>
#include <uv.h>
#ifdef __ANDROID__
#include <mbgl/android/jni.hpp>

View File

@@ -1,11 +1,15 @@
#include <mbgl/util/run_loop.hpp>
#include <uv.h>
#include <mbgl/util/async_task.hpp>
#include <mbgl/util/uv.hpp>
namespace mbgl {
namespace util {
uv::tls<RunLoop> RunLoop::current;
static uv::tls<RunLoop> current;
RunLoop* RunLoop::Get() {
return current.get();
}
class RunLoop::Impl {
public:
@@ -13,6 +17,7 @@ public:
uv_loop_t *loop;
RunLoop::Type type;
std::unique_ptr<AsyncTask> async;
};
RunLoop::RunLoop(Type type) : impl(std::make_unique<Impl>()) {
@@ -36,7 +41,7 @@ RunLoop::RunLoop(Type type) : impl(std::make_unique<Impl>()) {
impl->type = type;
current.set(this);
async = std::make_unique<AsyncTask>(std::bind(&RunLoop::process, this));
impl->async = std::make_unique<AsyncTask>(std::bind(&RunLoop::process, this));
}
RunLoop::~RunLoop() {
@@ -50,7 +55,7 @@ RunLoop::~RunLoop() {
// close callbacks have been called. Not needed
// for the default main loop because it is only
// closed when the application exits.
async.reset();
impl->async.reset();
runOnce();
#if UV_VERSION_MAJOR == 0 && UV_VERSION_MINOR <= 10
@@ -67,6 +72,11 @@ LOOP_HANDLE RunLoop::getLoopHandle() {
return current.get()->impl->loop;
}
void RunLoop::push(std::shared_ptr<WorkTask> task) {
withMutex([&] { queue.push(task); });
impl->async->send();
}
void RunLoop::run() {
uv_run(impl->loop, UV_RUN_DEFAULT);
}
@@ -76,7 +86,7 @@ void RunLoop::runOnce() {
}
void RunLoop::stop() {
invoke([&] { async->unref(); });
invoke([&] { impl->async->unref(); });
}
}

View File

@@ -1,7 +1,8 @@
#include <mbgl/util/work_queue.hpp>
#include <mbgl/util/run_loop.hpp>
#include <cassert>
namespace mbgl {
namespace util {