a8b6b67dfe
mbgl::Thread will keep a ThreadContext for each running instance in a thread_local so we don't need to lookup a man in the Environment every time we need some info about the current thread. This patch is moving the ::currentlyOn check used on Debug build from the Environment class to the ThreadContext.
103 lines
3.1 KiB
C++
103 lines
3.1 KiB
C++
#include <mbgl/util/thread.hpp>
|
|
#include <mbgl/util/run_loop.hpp>
|
|
|
|
#include "../fixtures/util.hpp"
|
|
|
|
using namespace mbgl::util;
|
|
|
|
class TestObject {
|
|
public:
|
|
TestObject(uv_loop_t*, std::thread::id otherTid)
|
|
: tid(std::this_thread::get_id()) {
|
|
EXPECT_NE(tid, otherTid);
|
|
}
|
|
|
|
void fn1(int val) {
|
|
EXPECT_EQ(tid, std::this_thread::get_id());
|
|
EXPECT_EQ(val, 1);
|
|
}
|
|
|
|
int fn2() {
|
|
EXPECT_EQ(tid, std::this_thread::get_id());
|
|
return 1;
|
|
}
|
|
|
|
void transferIn(std::unique_ptr<int> val) {
|
|
EXPECT_EQ(tid, std::this_thread::get_id());
|
|
EXPECT_EQ(*val, 1);
|
|
}
|
|
|
|
std::unique_ptr<int> transferOut() {
|
|
EXPECT_EQ(tid, std::this_thread::get_id());
|
|
return std::make_unique<int>(1);
|
|
}
|
|
|
|
std::unique_ptr<int> transferInOut(std::unique_ptr<int> val) {
|
|
EXPECT_EQ(tid, std::this_thread::get_id());
|
|
EXPECT_EQ(*val, 1);
|
|
return std::move(val);
|
|
}
|
|
|
|
void transferInShared(std::shared_ptr<int> val) {
|
|
EXPECT_EQ(tid, std::this_thread::get_id());
|
|
EXPECT_EQ(*val, 1);
|
|
}
|
|
|
|
std::shared_ptr<int> transferOutShared() {
|
|
EXPECT_EQ(tid, std::this_thread::get_id());
|
|
return std::make_shared<int>(1);
|
|
}
|
|
|
|
std::string transferString(const std::string& string) {
|
|
EXPECT_EQ(tid, std::this_thread::get_id());
|
|
EXPECT_EQ(string, "test");
|
|
return string;
|
|
}
|
|
|
|
const std::thread::id tid;
|
|
};
|
|
|
|
TEST(Thread, invoke) {
|
|
const std::thread::id tid = std::this_thread::get_id();
|
|
|
|
RunLoop loop(uv_default_loop());
|
|
|
|
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) {
|
|
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) {
|
|
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) {
|
|
EXPECT_EQ(tid, std::this_thread::get_id());
|
|
EXPECT_EQ(*result, 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) {
|
|
EXPECT_EQ(tid, std::this_thread::get_id());
|
|
EXPECT_EQ(*result, 1);
|
|
});
|
|
|
|
std::string test("test");
|
|
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.clear();
|
|
});
|
|
|
|
uv_run(uv_default_loop(), UV_RUN_DEFAULT);
|
|
}
|