atria-soft/jvm-basics
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] remove STL

Browse Source
This commit is contained in:
Edouard DUPIN 2017-09-07 23:38:26 +02:00
parent 50bf009154
commit 8dab81e59b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jvm-basics/jvm-basics.cpp
View File

@ -6,7 +6,7 @@
#include <jni.h> #include <jni.h>
#include <pthread.h> #include <pthread.h>
#include <mutex> #include <ethread/Mutex.hpp>
#include <jvm-basics/debug.hpp> #include <jvm-basics/debug.hpp>
#include <jvm-basics/jvm-basics.hpp> #include <jvm-basics/jvm-basics.hpp>
@ -17,8 +17,8 @@ JavaVM*& jvm_basics::getJavaVM() {
static JavaVM* g_JavaVM=nullptr; // global acces on the unique JVM !!! static JavaVM* g_JavaVM=nullptr; // global acces on the unique JVM !!!
return g_JavaVM; return g_JavaVM;
} }
std::mutex& jvm_basics::getMutexJavaVM() { ethread::Mutex& jvm_basics::getMutexJavaVM() {
static std::mutex g_jvmMutex; static ethread::Mutex g_jvmMutex;
return g_jvmMutex; return g_jvmMutex;
} }
@ -34,14 +34,14 @@ extern "C" {
// JNI onLoad // JNI onLoad
JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* _jvm, void* _reserved) { JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* _jvm, void* _reserved) {
// get the java virtual machine handle ... // get the java virtual machine handle ...
std::unique_lock<std::mutex> lock(jvm_basics::getMutexJavaVM()); std::unique_lock<ethread::Mutex> lock(jvm_basics::getMutexJavaVM());
jvm_basics::getJavaVM() = _jvm; jvm_basics::getJavaVM() = _jvm;
JVMB_INFO("JNI-> load the jvm ..." ); JVMB_INFO("JNI-> load the jvm ..." );
return JNI_VERSION_1_6; return JNI_VERSION_1_6;
} }
// JNI onUnLoad // JNI onUnLoad
JNIEXPORT void JNICALL JNI_OnUnload(JavaVM* _vm, void *_reserved) { JNIEXPORT void JNICALL JNI_OnUnload(JavaVM* _vm, void *_reserved) {
std::unique_lock<std::mutex> lock(jvm_basics::getMutexJavaVM()); std::unique_lock<ethread::Mutex> lock(jvm_basics::getMutexJavaVM());
jvm_basics::getJavaVM() = nullptr; jvm_basics::getJavaVM() = nullptr;
JVMB_INFO("JNI-> Un-load the jvm ..." ); JVMB_INFO("JNI-> Un-load the jvm ..." );
} }

2
jvm-basics/jvm-basics.hpp
View File

@ -7,7 +7,7 @@
namespace jvm_basics { namespace jvm_basics {
JavaVM*& getJavaVM(); JavaVM*& getJavaVM();
std::mutex& getMutexJavaVM(); ethread::Mutex& getMutexJavaVM();
void checkExceptionJavaVM(JNIEnv* _env); void checkExceptionJavaVM(JNIEnv* _env);
} }