Skip to content

Move get_jvm_env back into the crossplat namespace #1073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 20, 2019
Merged

Move get_jvm_env back into the crossplat namespace #1073

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c45969
Move get_jvm_env back into the crossplat namespace as it is declared …
BillyONeal Mar 20, 2019
f7236c7
Add more missing crossplat:: qualifications.
BillyONeal Mar 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 22 additions & 20 deletions Release/src/pplx/threadpool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,9 @@ namespace
{
#if defined(__ANDROID__)
// This pointer will be 0-initialized by default (at load time).
std::atomic<JavaVM*> JVM;

static void abort_if_no_jvm()
{
if (JVM == nullptr)
if (crossplat::JVM == nullptr)
{
__android_log_print(ANDROID_LOG_ERROR,
"CPPRESTSDK",
Expand All @@ -35,19 +33,6 @@ static void abort_if_no_jvm()
std::abort();
}
}

JNIEnv* get_jvm_env()
{
abort_if_no_jvm();
JNIEnv* env = nullptr;
auto result = JVM.load()->AttachCurrentThread(&env, nullptr);
if (result != JNI_OK)
{
throw std::runtime_error("Could not attach to JVM");
}

return env;
}
#endif // __ANDROID__

struct threadpool_impl final : crossplat::threadpool
Expand Down Expand Up @@ -80,14 +65,14 @@ struct threadpool_impl final : crossplat::threadpool
}

#if defined(__ANDROID__)
static void detach_from_java(void*) { JVM.load()->DetachCurrentThread(); }
static void detach_from_java(void*) { crossplat::JVM.load()->DetachCurrentThread(); }
#endif // __ANDROID__

static void* thread_start(void* arg) CPPREST_NOEXCEPT
{
#if defined(__ANDROID__)
// Calling get_jvm_env() here forces the thread to be attached.
get_jvm_env();
crossplat::get_jvm_env();
pthread_cleanup_push(detach_from_java, nullptr);
#endif // __ANDROID__
threadpool_impl* _this = reinterpret_cast<threadpool_impl*>(arg);
Expand Down Expand Up @@ -220,11 +205,28 @@ void threadpool::initialize_with_threads(size_t num_threads)
throw std::runtime_error("the cpprestsdk threadpool has already been initialized");
}
}

#if defined(__ANDROID__)
std::atomic<JavaVM*> JVM;

JNIEnv* get_jvm_env()
{
abort_if_no_jvm();
JNIEnv* env = nullptr;
auto result = crossplat::JVM.load()->AttachCurrentThread(&env, nullptr);
if (result != JNI_OK)
{
throw std::runtime_error("Could not attach to JVM");
}

return env;
}
#endif // defined(__ANDROID__)
} // namespace crossplat

#if defined(__ANDROID__)
void cpprest_init(JavaVM* vm) { JVM = vm; }
#endif
void cpprest_init(JavaVM* vm) { crossplat::JVM = vm; }
#endif // defined(__ANDROID__)

std::unique_ptr<crossplat::threadpool> crossplat::threadpool::construct(size_t num_threads)
{
Expand Down