Move WorkerTask functionality into RunLoop core
As a byproduct, this makes FileCache get requests properly cancelable.
This commit is contained in:
@@ -67,40 +67,46 @@ TEST(Thread, invoke) {
|
||||
const std::thread::id tid = std::this_thread::get_id();
|
||||
|
||||
RunLoop loop(uv_default_loop());
|
||||
std::vector<std::unique_ptr<mbgl::WorkRequest>> requests;
|
||||
|
||||
loop.invoke([&] {
|
||||
EXPECT_EQ(tid, std::this_thread::get_id());
|
||||
Thread<TestObject> thread({"Test", ThreadType::Map, ThreadPriority::Regular}, tid);
|
||||
|
||||
thread.invoke(&TestObject::fn1, 1);
|
||||
thread.invokeWithResult<int>(&TestObject::fn2, [&] (int result) {
|
||||
requests.push_back(thread.invokeWithResult<int>(&TestObject::fn2, [&] (int result) {
|
||||
EXPECT_EQ(tid, std::this_thread::get_id());
|
||||
EXPECT_EQ(result, 1);
|
||||
});
|
||||
}));
|
||||
|
||||
thread.invoke(&TestObject::transferIn, std::make_unique<int>(1));
|
||||
thread.invokeWithResult<std::unique_ptr<int>>(&TestObject::transferOut, [&] (std::unique_ptr<int> result) {
|
||||
requests.push_back(thread.invokeWithResult<std::unique_ptr<int>>(&TestObject::transferOut, [&] (std::unique_ptr<int> result) {
|
||||
EXPECT_EQ(tid, std::this_thread::get_id());
|
||||
EXPECT_EQ(*result, 1);
|
||||
});
|
||||
}));
|
||||
|
||||
thread.invokeWithResult<std::unique_ptr<int>>(&TestObject::transferInOut, [&] (std::unique_ptr<int> result) {
|
||||
requests.push_back(thread.invokeWithResult<std::unique_ptr<int>>(&TestObject::transferInOut, [&] (std::unique_ptr<int> result) {
|
||||
EXPECT_EQ(tid, std::this_thread::get_id());
|
||||
EXPECT_EQ(*result, 1);
|
||||
}, std::make_unique<int>(1));
|
||||
}, std::make_unique<int>(1)));
|
||||
|
||||
thread.invoke(&TestObject::transferInShared, std::make_shared<int>(1));
|
||||
thread.invokeWithResult<std::shared_ptr<int>>(&TestObject::transferOutShared, [&] (std::shared_ptr<int> result) {
|
||||
requests.push_back(thread.invokeWithResult<std::shared_ptr<int>>(&TestObject::transferOutShared, [&] (std::shared_ptr<int> result) {
|
||||
EXPECT_EQ(tid, std::this_thread::get_id());
|
||||
EXPECT_EQ(*result, 1);
|
||||
});
|
||||
}));
|
||||
|
||||
// Cancelled request
|
||||
thread.invokeWithResult(&TestObject::fn1, [&] {
|
||||
ADD_FAILURE();
|
||||
}, 1);
|
||||
|
||||
std::string test("test");
|
||||
thread.invokeWithResult<std::string>(&TestObject::transferString, [&] (std::string result){
|
||||
requests.push_back(thread.invokeWithResult<std::string>(&TestObject::transferString, [&] (std::string result){
|
||||
EXPECT_EQ(tid, std::this_thread::get_id());
|
||||
EXPECT_EQ(result, "test");
|
||||
loop.stop();
|
||||
}, test);
|
||||
}, test));
|
||||
test.clear();
|
||||
});
|
||||
|
||||
@@ -117,14 +123,15 @@ TEST(Thread, context) {
|
||||
const std::thread::id tid = std::this_thread::get_id();
|
||||
|
||||
RunLoop loop(uv_default_loop());
|
||||
std::vector<std::unique_ptr<mbgl::WorkRequest>> requests;
|
||||
|
||||
loop.invoke([&] {
|
||||
Thread<TestObject> thread({"Test", ThreadType::Worker, ThreadPriority::Low}, tid);
|
||||
|
||||
thread.invokeWithResult<bool>(&TestObject::checkContext, [&] (bool inTestThreadContext) {
|
||||
requests.push_back(thread.invokeWithResult<bool>(&TestObject::checkContext, [&] (bool inTestThreadContext) {
|
||||
EXPECT_EQ(inTestThreadContext, true);
|
||||
loop.stop();
|
||||
});
|
||||
}));
|
||||
});
|
||||
|
||||
uv_run(uv_default_loop(), UV_RUN_DEFAULT);
|
||||
|
||||
Reference in New Issue
Block a user