tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'uv_leak'

Browse Source
This commit is contained in:
John Firebaugh
2015-05-01 18:24:58 -04:00
parent 24695f6c02 4c8f716f20
commit b713930c7f
6 changed files with 76 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/mbgl/storage/sqlite_cache.hpp
View File

@@ -20,8 +20,9 @@ public:
void get(const Resource &resource, Callback callback) override;
void put(const Resource &resource, std::shared_ptr<const Response> response, Hint hint) override;
private:
class Impl;
private:
const std::unique_ptr<util::Thread<Impl>> thread;
};

16
src/mbgl/util/run_loop.cpp
View File

@@ -5,8 +5,13 @@ namespace util {
uv::tls<RunLoop> RunLoop::current;
RunLoop::RunLoop()
: async(*loop, std::bind(&RunLoop::process, this)) {
RunLoop::RunLoop(uv_loop_t* loop)
: async(loop, std::bind(&RunLoop::process, this)) {
current.set(this);
}
RunLoop::~RunLoop() {
current.set(nullptr);
}
void RunLoop::withMutex(std::function<void()>&& fn) {
@@ -24,13 +29,6 @@ void RunLoop::process() {
}
}
void RunLoop::run() {
assert(!current.get());
current.set(this);
loop.run();
current.set(nullptr);
}
void RunLoop::stop() {
invoke([&] { async.unref(); });
}

8
src/mbgl/util/run_loop.hpp
View File

@@ -14,9 +14,9 @@ namespace util {
class RunLoop : private util::noncopyable {
public:
RunLoop();
RunLoop(uv_loop_t*);
~RunLoop();
void run();
void stop();
// Invoke fn() in the runloop thread.
@@ -63,7 +63,7 @@ public:
});
}
uv_loop_t* get() { return *loop; }
uv_loop_t* get() { return async.get()->loop; }
static uv::tls<RunLoop> current;
@@ -90,8 +90,6 @@ private:
Queue queue;
std::mutex mutex;
uv::loop loop;
uv::async async;
};

20
src/mbgl/util/thread.hpp
View File

@@ -77,11 +77,6 @@ public:
return future.get();
}
// Join the thread, but call the given function repeatedly in the current thread
// while waiting for the join to finish. This should be immediately followed by
// destroying the Thread.
void pumpingStop(std::function<void ()>);
private:
Thread(const Thread&) = delete;
Thread(Thread&&) = delete;
@@ -124,21 +119,24 @@ Thread<Object>::Thread(const std::string& name, Args&&... args) {
template <class Object>
template <typename P, std::size_t... I>
void Thread<Object>::run(P&& params, index_sequence<I...>) {
RunLoop loop_;
loop = &loop_;
uv::loop l;
{
Object object_(loop_.get(), std::get<I>(std::forward<P>(params))...);
Object object_(l.get(), std::get<I>(std::forward<P>(params))...);
object = &object_;
running.set_value();
loop_.run();
RunLoop loop_(l.get());
loop = &loop_;
running.set_value();
l.run();
loop = nullptr;
object = nullptr;
}
// Run the loop again to ensure that async close callbacks have been called.
loop_.run();
l.run();
joinable.get_future().get();
}

198
test/storage/database.cpp
View File

@@ -1,11 +1,10 @@
#include "storage.hpp"
#include "../fixtures/fixture_log_observer.hpp"
#include <mbgl/storage/sqlite_cache.hpp>
#include "sqlite_cache_impl.hpp"
#include <mbgl/storage/resource.hpp>
#include <mbgl/storage/response.hpp>
#include <mbgl/util/io.hpp>
#include <mbgl/util/run_loop.hpp>
#include <sqlite3.h>
@@ -14,18 +13,10 @@ TEST_F(Storage, DatabaseDoesNotExist) {
Log::setObserver(util::make_unique<FixtureLogObserver>());
SQLiteCache cache("test/fixtures/404/cache.db");
SQLiteCache::Impl cache(nullptr, "test/fixtures/404/cache.db");
util::RunLoop loop;
loop.invoke([&] {
cache.get({ Resource::Unknown, "mapbox://test" }, [&] (std::unique_ptr<Response> res) {
EXPECT_EQ(nullptr, res.get());
loop.stop();
});
});
loop.run();
std::unique_ptr<Response> res = cache.get({ Resource::Unknown, "mapbox://test" });
EXPECT_EQ(nullptr, res.get());
auto observer = Log::removeObserver();
EXPECT_EQ(1ul, dynamic_cast<FixtureLogObserver*>(observer.get())->count({ EventSeverity::Error, Event::Database, 14, "unable to open database file" }));
@@ -63,18 +54,10 @@ TEST_F(Storage, DatabaseCreate) {
Log::setObserver(util::make_unique<FixtureLogObserver>());
SQLiteCache cache("test/fixtures/database/cache.db");
SQLiteCache::Impl cache(nullptr, "test/fixtures/database/cache.db");
util::RunLoop loop;
loop.invoke([&] {
cache.get({ Resource::Unknown, "mapbox://test" }, [&] (std::unique_ptr<Response> res) {
EXPECT_EQ(nullptr, res.get());
loop.stop();
});
});
loop.run();
std::unique_ptr<Response> res = cache.get({ Resource::Unknown, "mapbox://test" });
EXPECT_EQ(nullptr, res.get());
Log::removeObserver();
}
@@ -126,23 +109,14 @@ TEST_F(Storage, DatabaseLockedRead) {
deleteFile("test/fixtures/database/locked.db");
FileLock guard("test/fixtures/database/locked.db");
SQLiteCache cache("test/fixtures/database/locked.db");
SQLiteCache::Impl cache(nullptr, "test/fixtures/database/locked.db");
{
// First request should fail.
Log::setObserver(util::make_unique<FixtureLogObserver>());
util::RunLoop loop;
loop.invoke([&] {
cache.get({ Resource::Unknown, "mapbox://test" }, [&] (std::unique_ptr<Response> res) {
EXPECT_EQ(nullptr, res.get());
loop.stop();
});
});
loop.run();
std::unique_ptr<Response> res = cache.get({ Resource::Unknown, "mapbox://test" });
EXPECT_EQ(nullptr, res.get());
// Make sure that we got a few "database locked" errors
auto observer = Log::removeObserver();
@@ -157,16 +131,8 @@ TEST_F(Storage, DatabaseLockedRead) {
// First, try getting a file (the cache value should not exist).
Log::setObserver(util::make_unique<FixtureLogObserver>());
util::RunLoop loop;
loop.invoke([&] {
cache.get({ Resource::Unknown, "mapbox://test" }, [&] (std::unique_ptr<Response> res) {
EXPECT_EQ(nullptr, res.get());
loop.stop();
});
});
loop.run();
std::unique_ptr<Response> res = cache.get({ Resource::Unknown, "mapbox://test" });
EXPECT_EQ(nullptr, res.get());
// Make sure that we got a no errors
Log::removeObserver();
@@ -183,24 +149,16 @@ TEST_F(Storage, DatabaseLockedWrite) {
deleteFile("test/fixtures/database/locked.db");
FileLock guard("test/fixtures/database/locked.db");
SQLiteCache cache("test/fixtures/database/locked.db");
SQLiteCache::Impl cache(nullptr, "test/fixtures/database/locked.db");
{
// Adds a file (which should fail).
Log::setObserver(util::make_unique<FixtureLogObserver>());
util::RunLoop loop;
loop.invoke([&] {
auto response = std::make_shared<Response>();
cache.put({ Resource::Unknown, "mapbox://test" }, response, FileCache::Hint::Full);
cache.get({ Resource::Unknown, "mapbox://test" }, [&] (std::unique_ptr<Response> res) {
EXPECT_EQ(nullptr, res.get());
loop.stop();
});
});
loop.run();
auto response = std::make_shared<Response>();
cache.put({ Resource::Unknown, "mapbox://test" }, response);
std::unique_ptr<Response> res = cache.get({ Resource::Unknown, "mapbox://test" });
EXPECT_EQ(nullptr, res.get());
auto observer = Log::removeObserver();
auto flo = dynamic_cast<FixtureLogObserver*>(observer.get());
@@ -214,20 +172,12 @@ TEST_F(Storage, DatabaseLockedWrite) {
// Then, set a file and obtain it again.
Log::setObserver(util::make_unique<FixtureLogObserver>());
util::RunLoop loop;
loop.invoke([&] {
auto response = std::make_shared<Response>();
response->data = "Demo";
cache.put({ Resource::Unknown, "mapbox://test" }, response, FileCache::Hint::Full);
cache.get({ Resource::Unknown, "mapbox://test" }, [&] (std::unique_ptr<Response> res) {
EXPECT_NE(nullptr, res.get());
EXPECT_EQ("Demo", res->data);
loop.stop();
});
});
loop.run();
auto response = std::make_shared<Response>();
response->data = "Demo";
cache.put({ Resource::Unknown, "mapbox://test" }, response);
std::unique_ptr<Response> res = cache.get({ Resource::Unknown, "mapbox://test" });
EXPECT_NE(nullptr, res.get());
EXPECT_EQ("Demo", res->data);
// Make sure that we got a no errors
Log::removeObserver();
@@ -244,7 +194,7 @@ TEST_F(Storage, DatabaseLockedRefresh) {
createDir("test/fixtures/database");
deleteFile("test/fixtures/database/locked.db");
SQLiteCache cache("test/fixtures/database/locked.db");
SQLiteCache::Impl cache(nullptr, "test/fixtures/database/locked.db");
// Then, lock the file and try again.
FileLock guard("test/fixtures/database/locked.db");
@@ -253,19 +203,11 @@ TEST_F(Storage, DatabaseLockedRefresh) {
// Adds a file.
Log::setObserver(util::make_unique<FixtureLogObserver>());
util::RunLoop loop;
loop.invoke([&] {
auto response = std::make_shared<Response>();
response->data = "Demo";
cache.put({ Resource::Unknown, "mapbox://test" }, response, FileCache::Hint::Full);
cache.get({ Resource::Unknown, "mapbox://test" }, [&] (std::unique_ptr<Response> res) {
EXPECT_EQ(nullptr, res.get());
loop.stop();
});
});
loop.run();
auto response = std::make_shared<Response>();
response->data = "Demo";
cache.put({ Resource::Unknown, "mapbox://test" }, response);
std::unique_ptr<Response> res = cache.get({ Resource::Unknown, "mapbox://test" });
EXPECT_EQ(nullptr, res.get());
auto observer = Log::removeObserver();
auto flo = dynamic_cast<FixtureLogObserver*>(observer.get());
@@ -276,19 +218,11 @@ TEST_F(Storage, DatabaseLockedRefresh) {
// Then, try to refresh it.
Log::setObserver(util::make_unique<FixtureLogObserver>());
util::RunLoop loop;
loop.invoke([&] {
auto response = std::make_shared<Response>();
response->data = "Demo";
cache.put({ Resource::Unknown, "mapbox://test" }, response, FileCache::Hint::Refresh);
cache.get({ Resource::Unknown, "mapbox://test" }, [&] (std::unique_ptr<Response> res) {
EXPECT_EQ(nullptr, res.get());
loop.stop();
});
});
loop.run();
auto response = std::make_shared<Response>();
response->data = "Demo";
cache.refresh({ Resource::Unknown, "mapbox://test" }, response->expires);
std::unique_ptr<Response> res = cache.get({ Resource::Unknown, "mapbox://test" });
EXPECT_EQ(nullptr, res.get());
// Make sure that we got the right errors.
auto observer = Log::removeObserver();
@@ -306,26 +240,18 @@ TEST_F(Storage, DatabaseDeleted) {
createDir("test/fixtures/database");
deleteFile("test/fixtures/database/locked.db");
SQLiteCache cache("test/fixtures/database/locked.db");
SQLiteCache::Impl cache(nullptr, "test/fixtures/database/locked.db");
{
// Adds a file.
Log::setObserver(util::make_unique<FixtureLogObserver>());
util::RunLoop loop;
loop.invoke([&] {
auto response = std::make_shared<Response>();
response->data = "Demo";
cache.put({ Resource::Unknown, "mapbox://test" }, response, FileCache::Hint::Full);
cache.get({ Resource::Unknown, "mapbox://test" }, [&] (std::unique_ptr<Response> res) {
EXPECT_NE(nullptr, res.get());
EXPECT_EQ("Demo", res->data);
loop.stop();
});
});
loop.run();
auto response = std::make_shared<Response>();
response->data = "Demo";
cache.put({ Resource::Unknown, "mapbox://test" }, response);
std::unique_ptr<Response> res = cache.get({ Resource::Unknown, "mapbox://test" });
EXPECT_NE(nullptr, res.get());
EXPECT_EQ("Demo", res->data);
Log::removeObserver();
}
@@ -336,20 +262,12 @@ TEST_F(Storage, DatabaseDeleted) {
// Adds a file.
Log::setObserver(util::make_unique<FixtureLogObserver>());
util::RunLoop loop;
loop.invoke([&] {
auto response = std::make_shared<Response>();
response->data = "Demo";
cache.put({ Resource::Unknown, "mapbox://test" }, response, FileCache::Hint::Full);
cache.get({ Resource::Unknown, "mapbox://test" }, [&] (std::unique_ptr<Response> res) {
EXPECT_NE(nullptr, res.get());
EXPECT_EQ("Demo", res->data);
loop.stop();
});
});
loop.run();
auto response = std::make_shared<Response>();
response->data = "Demo";
cache.put({ Resource::Unknown, "mapbox://test" }, response);
std::unique_ptr<Response> res = cache.get({ Resource::Unknown, "mapbox://test" });
EXPECT_NE(nullptr, res.get());
EXPECT_EQ("Demo", res->data);
auto observer = Log::removeObserver();
auto flo = dynamic_cast<FixtureLogObserver*>(observer.get());
@@ -367,26 +285,18 @@ TEST_F(Storage, DatabaseInvalid) {
deleteFile("test/fixtures/database/invalid.db");
writeFile("test/fixtures/database/invalid.db", "this is an invalid file");
SQLiteCache cache("test/fixtures/database/invalid.db");
SQLiteCache::Impl cache(nullptr, "test/fixtures/database/invalid.db");
{
// Adds a file.
Log::setObserver(util::make_unique<FixtureLogObserver>());
util::RunLoop loop;
loop.invoke([&] {
auto response = std::make_shared<Response>();
response->data = "Demo";
cache.put({ Resource::Unknown, "mapbox://test" }, response, FileCache::Hint::Full);
cache.get({ Resource::Unknown, "mapbox://test" }, [&] (std::unique_ptr<Response> res) {
EXPECT_NE(nullptr, res.get());
EXPECT_EQ("Demo", res->data);
loop.stop();
});
});
loop.run();
auto response = std::make_shared<Response>();
response->data = "Demo";
cache.put({ Resource::Unknown, "mapbox://test" }, response);
std::unique_ptr<Response> res = cache.get({ Resource::Unknown, "mapbox://test" });
EXPECT_NE(nullptr, res.get());
EXPECT_EQ("Demo", res->data);
auto observer = Log::removeObserver();
auto flo = dynamic_cast<FixtureLogObserver*>(observer.get());

2
test/test.gypi
View File

@@ -17,7 +17,7 @@
},
{ 'target_name': 'test',
'type': 'executable',
'include_dirs': [ '../include', '../src' ],
'include_dirs': [ '../include', '../src', '../platform/default' ],
'dependencies': [
'symlink_TEST_DATA',
'../mbgl.gyp:core',