[core] Clean up ThreadContext vestiges

This commit is contained in:
John Firebaugh
2016-02-16 13:48:33 -08:00
parent 253a007d99
commit 6e78eabfff
26 changed files with 32 additions and 151 deletions

View File

@@ -1,67 +1,12 @@
#include <mbgl/util/thread_context.hpp>
#include <mbgl/util/thread_local.hpp>
#include <cassert>
namespace {
using namespace mbgl::util;
static ThreadLocal<ThreadContext>& current = *new ThreadLocal<ThreadContext>;
} // namespace
namespace mbgl {
namespace util {
ThreadContext::ThreadContext(const std::string& name_, ThreadType type_, ThreadPriority priority_)
ThreadContext::ThreadContext(const std::string& name_, ThreadPriority priority_)
: name(name_),
type(type_),
priority(priority_) {
}
void ThreadContext::Set(ThreadContext* context) {
current.set(context);
}
bool ThreadContext::currentlyOn(ThreadType type) {
return current.get()->type == type;
}
std::string ThreadContext::getName() {
if (current.get() != nullptr) {
return current.get()->name;
} else {
return "Unknown";
}
}
ThreadPriority ThreadContext::getPriority() {
if (current.get() != nullptr) {
return current.get()->priority;
} else {
return ThreadPriority::Regular;
}
}
class MainThreadContextRegistrar {
public:
MainThreadContextRegistrar() : context("Main", ThreadType::Main, ThreadPriority::Regular) {
ThreadContext::Set(&context);
}
~MainThreadContextRegistrar() {
ThreadContext::Set(nullptr);
}
private:
ThreadContext context;
};
// Will auto register the main thread context
// at startup. Must be instantiated after the
// ThreadContext::current object.
MainThreadContextRegistrar registrar;
} // namespace util
} // namespace mbgl