From 0c087603e602bbb5ad25b4924f49169a316f695e Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Thu, 9 Apr 2015 11:51:57 -0700 Subject: [PATCH 1/2] Replace uv_messenger with AsyncQueue; rewrite remaining uv_* in C++ --- include/mbgl/map/map.hpp | 5 +- include/mbgl/util/uv-messenger.h | 33 ------ include/mbgl/util/uv.hpp | 1 - src/mbgl/map/map.cpp | 5 +- src/mbgl/map/source.cpp | 4 +- src/mbgl/map/source.hpp | 5 +- src/mbgl/map/tile_data.cpp | 22 ++-- src/mbgl/map/tile_data.hpp | 11 +- src/mbgl/util/channel.hpp | 39 +++++++ src/mbgl/util/queue.h | 92 ----------------- src/mbgl/util/uv-channel.c | 69 ------------- src/mbgl/util/uv-channel.h | 29 ------ src/mbgl/util/uv-messenger.c | 86 ---------------- src/mbgl/util/uv-worker.c | 170 ------------------------------- src/mbgl/util/uv-worker.h | 41 -------- src/mbgl/util/uv_detail.hpp | 51 ---------- src/mbgl/util/worker.cpp | 73 +++++++++++++ src/mbgl/util/worker.hpp | 44 ++++++++ 18 files changed, 178 insertions(+), 602 deletions(-) delete mode 100644 include/mbgl/util/uv-messenger.h create mode 100644 src/mbgl/util/channel.hpp delete mode 100644 src/mbgl/util/queue.h delete mode 100644 src/mbgl/util/uv-channel.c delete mode 100644 src/mbgl/util/uv-channel.h delete mode 100644 src/mbgl/util/uv-messenger.c delete mode 100644 src/mbgl/util/uv-worker.c delete mode 100644 src/mbgl/util/uv-worker.h create mode 100644 src/mbgl/util/worker.cpp create mode 100644 src/mbgl/util/worker.hpp diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 129d463b2..8b9398f57 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -40,6 +40,7 @@ class Environment; class EnvironmentScope; class AnnotationManager; class MapData; +class Worker; class Map : private util::noncopyable { friend class View; @@ -165,7 +166,7 @@ private: void resize(uint16_t width, uint16_t height, float ratio, uint16_t fbWidth, uint16_t fbHeight); util::ptr getSprite(); - uv::worker& getWorker(); + Worker& getWorker(); // Checks if render thread needs to pause void checkForPause(); @@ -207,7 +208,7 @@ private: View &view; private: - std::unique_ptr workers; + std::unique_ptr workers; std::thread thread; std::unique_ptr asyncTerminate; std::unique_ptr asyncUpdate; diff --git a/include/mbgl/util/uv-messenger.h b/include/mbgl/util/uv-messenger.h deleted file mode 100644 index 35c5ce218..000000000 --- a/include/mbgl/util/uv-messenger.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef MBGL_UTIL_UV_MESSENGER -#define MBGL_UTIL_UV_MESSENGER - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct uv_messenger_s uv_messenger_t; -typedef void (*uv_messenger_cb)(void *arg); -typedef void (*uv_messenger_stop_cb)(uv_messenger_t *msgr); - -struct uv_messenger_s { - uv_mutex_t mutex; - uv_async_t async; - uv_messenger_cb callback; - uv_messenger_stop_cb stop_callback; - void *data; - void *queue[2]; -}; - -int uv_messenger_init(uv_loop_t *loop, uv_messenger_t *msgr, uv_messenger_cb callback); -void uv_messenger_send(uv_messenger_t *msgr, void *arg); -void uv_messenger_stop(uv_messenger_t *msgr, uv_messenger_stop_cb stop_callback); -void uv_messenger_ref(uv_messenger_t *msgr); -void uv_messenger_unref(uv_messenger_t *msgr); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/include/mbgl/util/uv.hpp b/include/mbgl/util/uv.hpp index 6f0a91604..19c6c5b4d 100644 --- a/include/mbgl/util/uv.hpp +++ b/include/mbgl/util/uv.hpp @@ -17,7 +17,6 @@ std::string cwd(); class rwlock; class loop; class async; -class worker; class mutex; class cond; diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index 5e046766e..f76845e3a 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -105,7 +106,7 @@ Map::~Map() { env->performCleanup(); } -uv::worker &Map::getWorker() { +Worker& Map::getWorker() { assert(workers); return *workers; } @@ -266,7 +267,7 @@ void Map::run() { view.activate(); - workers = util::make_unique(env->loop, 4, "Tile Worker"); + workers = util::make_unique(env->loop, 4); setup(); prepare(); diff --git a/src/mbgl/map/source.cpp b/src/mbgl/map/source.cpp index fa7ab6b96..29f84171d 100644 --- a/src/mbgl/map/source.cpp +++ b/src/mbgl/map/source.cpp @@ -215,7 +215,7 @@ TileData::State Source::hasTile(const TileID& id) { return TileData::State::invalid; } -TileData::State Source::addTile(Map &map, uv::worker &worker, +TileData::State Source::addTile(Map &map, Worker &worker, util::ptr