From 8ae3174873113fa4d92b9940aa4bffcf6318fb7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= Date: Thu, 27 Feb 2020 07:42:52 -0800 Subject: [PATCH] Run clang-format and apply patches Summary: Run clang-format and add .clang-tidy with `clang-diagnostic-*` to several more directories in order to catch any problems. Changelog: [Internal] Reviewed By: shergin Differential Revision: D19860169 fbshipit-source-id: 7785aab010c8e6945cc6b5c9b68cb8ee0cdbb7fa --- .../hermes/instrumentation/OnLoad.cpp | 2 +- .../reactexecutor/HermesExecutorFactory.h | 4 +- .../jni/ReactCommon/CallInvokerHolder.cpp | 3 +- .../src/main/jni/first-party/.clang-tidy | 5 + .../src/main/jni/first-party/fb/assert.cpp | 30 +- .../main/jni/first-party/fb/include/fb/ALog.h | 61 +- .../jni/first-party/fb/include/fb/Build.h | 12 +- .../jni/first-party/fb/include/fb/Countable.h | 16 +- .../first-party/fb/include/fb/Environment.h | 71 +- .../fb/include/fb/ProgramLocation.h | 46 +- .../jni/first-party/fb/include/fb/RefPtr.h | 116 +- .../fb/include/fb/StaticInitialized.h | 19 +- .../first-party/fb/include/fb/ThreadLocal.h | 46 +- .../jni/first-party/fb/include/fb/assert.h | 21 +- .../main/jni/first-party/fb/include/fb/log.h | 12 +- .../first-party/fb/include/fb/noncopyable.h | 9 +- .../first-party/fb/include/fb/nonmovable.h | 9 +- .../src/main/jni/first-party/fb/log.cpp | 46 +- .../jni/first-party/fbgloginit/fb/glog_init.h | 8 +- .../jni/first-party/fbgloginit/glog_init.cpp | 66 +- .../main/jni/first-party/jni-hack/real/jni.h | 2122 +++++++++-------- .../main/jni/react/jni/CxxModuleWrapper.cpp | 39 +- .../src/main/jni/react/jni/CxxModuleWrapper.h | 24 +- .../jni/react/jni/CxxSharedModuleWrapper.h | 13 +- .../src/main/jni/react/jni/JInspector.cpp | 45 +- .../src/main/jni/react/jni/JNativeRunnable.h | 13 +- .../src/main/jni/react/jni/JSLogging.cpp | 4 +- .../src/main/jni/react/jni/JSLogging.h | 6 +- .../jni/react/jni/JniJSModulesUnbundle.cpp | 44 +- .../main/jni/react/jni/JniJSModulesUnbundle.h | 25 +- .../jni/react/jni/ModuleRegistryBuilder.cpp | 34 +- .../src/main/jni/react/jni/NativeCommon.cpp | 7 +- .../src/main/jni/react/jni/NativeMap.cpp | 6 +- .../main/jni/react/jni/ReadableNativeArray.h | 14 +- .../jni/react/jni/WritableNativeArray.cpp | 7 +- .../main/jni/react/jni/WritableNativeMap.cpp | 20 +- ReactCommon/better/.clang-tidy | 5 + ReactCommon/config/.clang-tidy | 5 + ReactCommon/cxxreact/JsArgumentHelpers-inl.h | 1 + ReactCommon/microprofiler/.clang-tidy | 5 + ReactCommon/utils/TimeUtils.h | 11 +- 41 files changed, 1691 insertions(+), 1361 deletions(-) create mode 100644 ReactAndroid/src/main/jni/first-party/.clang-tidy create mode 100644 ReactCommon/better/.clang-tidy create mode 100644 ReactCommon/config/.clang-tidy create mode 100644 ReactCommon/microprofiler/.clang-tidy diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/OnLoad.cpp b/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/OnLoad.cpp index 89ab5645f89..b77c90294d5 100644 --- a/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/OnLoad.cpp +++ b/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/OnLoad.cpp @@ -7,7 +7,7 @@ #include "HermesSamplingProfiler.h" -JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved) { +JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { return facebook::jni::initialize(vm, [] { facebook::jsi::jni::HermesSamplingProfiler::registerNatives(); }); diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/HermesExecutorFactory.h b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/HermesExecutorFactory.h index 9744a8312a3..99d3eb34f4e 100644 --- a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/HermesExecutorFactory.h +++ b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/HermesExecutorFactory.h @@ -19,7 +19,7 @@ class HermesExecutorFactory : public JSExecutorFactory { public: explicit HermesExecutorFactory( JSIExecutor::RuntimeInstaller runtimeInstaller, - const JSIScopedTimeoutInvoker& timeoutInvoker = + const JSIScopedTimeoutInvoker &timeoutInvoker = JSIExecutor::defaultTimeoutInvoker, ::hermes::vm::RuntimeConfig runtimeConfig = ::hermes::vm::RuntimeConfig()) : runtimeInstaller_(runtimeInstaller), @@ -44,7 +44,7 @@ class HermesExecutor : public JSIExecutor { std::shared_ptr runtime, std::shared_ptr delegate, std::shared_ptr jsQueue, - const JSIScopedTimeoutInvoker& timeoutInvoker, + const JSIScopedTimeoutInvoker &timeoutInvoker, RuntimeInstaller runtimeInstaller); private: diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/CallInvokerHolder.cpp b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/CallInvokerHolder.cpp index 4635fe990c8..1169dd2337e 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/CallInvokerHolder.cpp +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/CallInvokerHolder.cpp @@ -10,8 +10,7 @@ namespace facebook { namespace react { -CallInvokerHolder::CallInvokerHolder( - std::shared_ptr callInvoker) +CallInvokerHolder::CallInvokerHolder(std::shared_ptr callInvoker) : _callInvoker(callInvoker) {} std::shared_ptr CallInvokerHolder::getCallInvoker() { diff --git a/ReactAndroid/src/main/jni/first-party/.clang-tidy b/ReactAndroid/src/main/jni/first-party/.clang-tidy new file mode 100644 index 00000000000..c98fd78ff64 --- /dev/null +++ b/ReactAndroid/src/main/jni/first-party/.clang-tidy @@ -0,0 +1,5 @@ +--- +Checks: '> +clang-diagnostic-*, +' +... diff --git a/ReactAndroid/src/main/jni/first-party/fb/assert.cpp b/ReactAndroid/src/main/jni/first-party/fb/assert.cpp index dd64bebc717..c0ec5661e88 100644 --- a/ReactAndroid/src/main/jni/first-party/fb/assert.cpp +++ b/ReactAndroid/src/main/jni/first-party/fb/assert.cpp @@ -5,8 +5,8 @@ * LICENSE file in the root directory of this source tree. */ -#include #include +#include #include #include @@ -17,23 +17,23 @@ namespace facebook { static char sAssertBuf[ASSERT_BUF_SIZE]; static AssertHandler gAssertHandler; -void assertInternal(const char* formatstr ...) { - va_list va_args; - va_start(va_args, formatstr); - vsnprintf(sAssertBuf, sizeof(sAssertBuf), formatstr, va_args); - va_end(va_args); - if (gAssertHandler != NULL) { - gAssertHandler(sAssertBuf); - } - FBLOG(LOG_FATAL, "fbassert", "%s", sAssertBuf); - // crash at this specific address so that we can find our crashes easier - *(int*)0xdeadb00c = 0; - // let the compiler know we won't reach the end of the function - __builtin_unreachable(); +void assertInternal(const char *formatstr...) { + va_list va_args; + va_start(va_args, formatstr); + vsnprintf(sAssertBuf, sizeof(sAssertBuf), formatstr, va_args); + va_end(va_args); + if (gAssertHandler != NULL) { + gAssertHandler(sAssertBuf); + } + FBLOG(LOG_FATAL, "fbassert", "%s", sAssertBuf); + // crash at this specific address so that we can find our crashes easier + *(int *)0xdeadb00c = 0; + // let the compiler know we won't reach the end of the function + __builtin_unreachable(); } void setAssertHandler(AssertHandler assertHandler) { - gAssertHandler = assertHandler; + gAssertHandler = assertHandler; } } // namespace facebook diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/ALog.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/ALog.h index 164288b42fa..6c78fbff562 100644 --- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/ALog.h +++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/ALog.h @@ -19,63 +19,64 @@ namespace facebook { namespace alog { -template -inline void log(int level, const char* tag, const char* msg, ARGS... args) noexcept { +template +inline void +log(int level, const char *tag, const char *msg, ARGS... args) noexcept { __android_log_print(level, tag, msg, args...); } -template -inline void log(int level, const char* tag, const char* msg) noexcept { +template +inline void log(int level, const char *tag, const char *msg) noexcept { __android_log_write(level, tag, msg); } -template -inline void logv(const char* tag, const char* msg, ARGS... args) noexcept { +template +inline void logv(const char *tag, const char *msg, ARGS... args) noexcept { log(ANDROID_LOG_VERBOSE, tag, msg, args...); } -template -inline void logd(const char* tag, const char* msg, ARGS... args) noexcept { +template +inline void logd(const char *tag, const char *msg, ARGS... args) noexcept { log(ANDROID_LOG_DEBUG, tag, msg, args...); } -template -inline void logi(const char* tag, const char* msg, ARGS... args) noexcept { +template +inline void logi(const char *tag, const char *msg, ARGS... args) noexcept { log(ANDROID_LOG_INFO, tag, msg, args...); } -template -inline void logw(const char* tag, const char* msg, ARGS... args) noexcept { +template +inline void logw(const char *tag, const char *msg, ARGS... args) noexcept { log(ANDROID_LOG_WARN, tag, msg, args...); } -template -inline void loge(const char* tag, const char* msg, ARGS... args) noexcept { +template +inline void loge(const char *tag, const char *msg, ARGS... args) noexcept { log(ANDROID_LOG_ERROR, tag, msg, args...); } -template -inline void logf(const char* tag, const char* msg, ARGS... args) noexcept { +template +inline void logf(const char *tag, const char *msg, ARGS... args) noexcept { log(ANDROID_LOG_FATAL, tag, msg, args...); } - #ifdef LOG_TAG -# define ALOGV(...) ::facebook::alog::logv(LOG_TAG, __VA_ARGS__) -# define ALOGD(...) ::facebook::alog::logd(LOG_TAG, __VA_ARGS__) -# define ALOGI(...) ::facebook::alog::logi(LOG_TAG, __VA_ARGS__) -# define ALOGW(...) ::facebook::alog::logw(LOG_TAG, __VA_ARGS__) -# define ALOGE(...) ::facebook::alog::loge(LOG_TAG, __VA_ARGS__) -# define ALOGF(...) ::facebook::alog::logf(LOG_TAG, __VA_ARGS__) +#define ALOGV(...) ::facebook::alog::logv(LOG_TAG, __VA_ARGS__) +#define ALOGD(...) ::facebook::alog::logd(LOG_TAG, __VA_ARGS__) +#define ALOGI(...) ::facebook::alog::logi(LOG_TAG, __VA_ARGS__) +#define ALOGW(...) ::facebook::alog::logw(LOG_TAG, __VA_ARGS__) +#define ALOGE(...) ::facebook::alog::loge(LOG_TAG, __VA_ARGS__) +#define ALOGF(...) ::facebook::alog::logf(LOG_TAG, __VA_ARGS__) #endif -}} +} // namespace alog +} // namespace facebook #else -# define ALOGV(...) ((void)0) -# define ALOGD(...) ((void)0) -# define ALOGI(...) ((void)0) -# define ALOGW(...) ((void)0) -# define ALOGE(...) ((void)0) -# define ALOGF(...) ((void)0) +#define ALOGV(...) ((void)0) +#define ALOGD(...) ((void)0) +#define ALOGI(...) ((void)0) +#define ALOGW(...) ((void)0) +#define ALOGE(...) ((void)0) +#define ALOGF(...) ((void)0) #endif diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/Build.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/Build.h index 4371f3460fa..812c4c89d18 100644 --- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/Build.h +++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/Build.h @@ -10,7 +10,7 @@ #include #if defined(__ANDROID__) -# include +#include #endif namespace facebook { @@ -19,13 +19,13 @@ namespace build { struct Build { static int getAndroidSdk() { static auto android_sdk = ([] { - char sdk_version_str[PROP_VALUE_MAX]; - __system_property_get("ro.build.version.sdk", sdk_version_str); - return atoi(sdk_version_str); + char sdk_version_str[PROP_VALUE_MAX]; + __system_property_get("ro.build.version.sdk", sdk_version_str); + return atoi(sdk_version_str); })(); return android_sdk; } }; -} // build -} // facebook +} // namespace build +} // namespace facebook diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/Countable.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/Countable.h index 01afe983edf..0035d15285b 100644 --- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/Countable.h +++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/Countable.h @@ -6,24 +6,23 @@ */ #pragma once -#include +#include #include #include #include -#include +#include namespace facebook { class Countable : public noncopyable, public nonmovable { -public: + public: // RefPtr expects refcount to start at 0 Countable() : m_refcount(0) {} - virtual ~Countable() - { + virtual ~Countable() { FBASSERT(m_refcount == 0); } -private: + private: void ref() { ++m_refcount; } @@ -38,8 +37,9 @@ private: return m_refcount == 1; } - template friend class RefPtr; + template + friend class RefPtr; std::atomic m_refcount; }; -} +} // namespace facebook diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/Environment.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/Environment.h index ef798b5d7c6..b2f390d91e9 100644 --- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/Environment.h +++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/Environment.h @@ -6,9 +6,9 @@ */ #pragma once +#include #include #include -#include #include @@ -16,51 +16,55 @@ namespace facebook { namespace jni { namespace internal { - struct CacheEnvTag {}; -} +struct CacheEnvTag {}; +} // namespace internal // Keeps a thread-local reference to the current thread's JNIEnv. struct Environment { // May be null if this thread isn't attached to the JVM - FBEXPORT static JNIEnv* current(); - static void initialize(JavaVM* vm); + FBEXPORT static JNIEnv *current(); + static void initialize(JavaVM *vm); // There are subtle issues with calling the next functions directly. It is // much better to always use a ThreadScope to manage attaching/detaching for // you. - FBEXPORT static JNIEnv* ensureCurrentThreadIsAttached(); + FBEXPORT static JNIEnv *ensureCurrentThreadIsAttached(); FBEXPORT static void detachCurrentThread(); }; /** - * RAII Object that attaches a thread to the JVM. Failing to detach from a thread before it - * exits will cause a crash, as will calling Detach an extra time, and this guard class helps - * keep that straight. In addition, it remembers whether it performed the attach or not, so it - * is safe to nest it with itself or with non-fbjni code that manages the attachment correctly. + * RAII Object that attaches a thread to the JVM. Failing to detach from a + * thread before it exits will cause a crash, as will calling Detach an extra + * time, and this guard class helps keep that straight. In addition, it + * remembers whether it performed the attach or not, so it is safe to nest it + * with itself or with non-fbjni code that manages the attachment correctly. * * Potential concerns: - * - Attaching to the JVM is fast (~100us on MotoG), but ideally you would attach while the - * app is not busy. - * - Having a thread detach at arbitrary points is not safe in Dalvik; you need to be sure that - * there is no Java code on the current stack or you run the risk of a crash like: - * ERROR: detaching thread with interp frames (count=18) - * (More detail at https://groups.google.com/forum/#!topic/android-ndk/2H8z5grNqjo) - * ThreadScope won't do a detach if the thread was already attached before the guard is + * - Attaching to the JVM is fast (~100us on MotoG), but ideally you would + * attach while the app is not busy. + * - Having a thread detach at arbitrary points is not safe in Dalvik; you need + * to be sure that there is no Java code on the current stack or you run the + * risk of a crash like: ERROR: detaching thread with interp frames (count=18) + * (More detail at + * https://groups.google.com/forum/#!topic/android-ndk/2H8z5grNqjo) ThreadScope + * won't do a detach if the thread was already attached before the guard is * instantiated, but there's probably some usage that could trip this up. - * - Newly attached C++ threads only get the bootstrap class loader -- i.e. java language - * classes, not any of our application's classes. This will be different behavior than threads - * that were initiated on the Java side. A workaround is to pass a global reference for a - * class or instance to the new thread; this bypasses the need for the class loader. - * (See http://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/invocation.html#attach_current_thread) - * If you need access to the application's classes, you can use ThreadScope::WithClassLoader. + * - Newly attached C++ threads only get the bootstrap class loader -- i.e. + * java language classes, not any of our application's classes. This will be + * different behavior than threads that were initiated on the Java side. A + * workaround is to pass a global reference for a class or instance to the new + * thread; this bypasses the need for the class loader. (See + * http://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/invocation.html#attach_current_thread) + * If you need access to the application's classes, you can use + * ThreadScope::WithClassLoader. */ class FBEXPORT ThreadScope { public: ThreadScope(); - ThreadScope(ThreadScope&) = delete; - ThreadScope(ThreadScope&&) = default; - ThreadScope& operator=(ThreadScope&) = delete; - ThreadScope& operator=(ThreadScope&&) = delete; + ThreadScope(ThreadScope &) = delete; + ThreadScope(ThreadScope &&) = default; + ThreadScope &operator=(ThreadScope &) = delete; + ThreadScope &operator=(ThreadScope &&) = delete; ~ThreadScope(); /** @@ -69,20 +73,21 @@ class FBEXPORT ThreadScope { * running in the closure will have access to the same classes as in a normal * java-create thread. */ - static void WithClassLoader(std::function&& runnable); + static void WithClassLoader(std::function &&runnable); static void OnLoad(); // This constructor is only used internally by fbjni. - ThreadScope(JNIEnv*, internal::CacheEnvTag); + ThreadScope(JNIEnv *, internal::CacheEnvTag); + private: friend struct Environment; - ThreadScope* previous_; + ThreadScope *previous_; // If the JNIEnv* is set, it is guaranteed to be valid at least through the // lifetime of this ThreadScope. The only case where that guarantee can be // made is when there is a java frame in the stack below this. - JNIEnv* env_; + JNIEnv *env_; bool attachedWithThisScope_; }; -} -} +} // namespace jni +} // namespace facebook diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/ProgramLocation.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/ProgramLocation.h index cc23ee71b04..dadf89ca15a 100644 --- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/ProgramLocation.h +++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/ProgramLocation.h @@ -7,42 +7,52 @@ #pragma once #include -#include #include +#include namespace facebook { #define FROM_HERE facebook::ProgramLocation(__FUNCTION__, __FILE__, __LINE__) class ProgramLocation { -public: - ProgramLocation() : m_functionName("Unspecified"), m_fileName("Unspecified"), m_lineNumber(0) {} + public: + ProgramLocation() + : m_functionName("Unspecified"), + m_fileName("Unspecified"), + m_lineNumber(0) {} - ProgramLocation(const char* functionName, const char* fileName, int line) : - m_functionName(functionName), - m_fileName(fileName), - m_lineNumber(line) - {} + ProgramLocation(const char *functionName, const char *fileName, int line) + : m_functionName(functionName), + m_fileName(fileName), + m_lineNumber(line) {} - const char* functionName() const { return m_functionName; } - const char* fileName() const { return m_fileName; } - int lineNumber() const { return m_lineNumber; } + const char *functionName() const { + return m_functionName; + } + const char *fileName() const { + return m_fileName; + } + int lineNumber() const { + return m_lineNumber; + } std::string asFormattedString() const { std::stringstream str; - str << "Function " << m_functionName << " in file " << m_fileName << ":" << m_lineNumber; + str << "Function " << m_functionName << " in file " << m_fileName << ":" + << m_lineNumber; return str.str(); } - bool operator==(const ProgramLocation& other) const { + bool operator==(const ProgramLocation &other) const { // Assumes that the strings are static - return (m_functionName == other.m_functionName) && (m_fileName == other.m_fileName) && m_lineNumber == other.m_lineNumber; + return (m_functionName == other.m_functionName) && + (m_fileName == other.m_fileName) && m_lineNumber == other.m_lineNumber; } -private: - const char* m_functionName; - const char* m_fileName; + private: + const char *m_functionName; + const char *m_fileName; int m_lineNumber; }; -} +} // namespace facebook diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/RefPtr.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/RefPtr.h index e39bd026480..1384b6534a5 100644 --- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/RefPtr.h +++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/RefPtr.h @@ -6,8 +6,8 @@ */ #pragma once -#include #include +#include namespace facebook { @@ -41,19 +41,13 @@ namespace facebook { // template class RefPtr { -public: - constexpr RefPtr() : - m_ptr(nullptr) - {} + public: + constexpr RefPtr() : m_ptr(nullptr) {} // Allow implicit construction from a pointer only from nullptr - constexpr RefPtr(std::nullptr_t ptr) : - m_ptr(nullptr) - {} + constexpr RefPtr(std::nullptr_t ptr) : m_ptr(nullptr) {} - RefPtr(const RefPtr& ref) : - m_ptr(ref.m_ptr) - { + RefPtr(const RefPtr &ref) : m_ptr(ref.m_ptr) { refIfNecessary(m_ptr); } @@ -61,15 +55,15 @@ public: // unless you use static_cast (which will end up invoking the explicit // operator below). template - RefPtr(const RefPtr& ref, typename std::enable_if::value, U>::type* = nullptr) : - m_ptr(ref.get()) - { + RefPtr( + const RefPtr &ref, + typename std::enable_if::value, U>::type * = + nullptr) + : m_ptr(ref.get()) { refIfNecessary(m_ptr); } - RefPtr(RefPtr&& ref) : - m_ptr(nullptr) - { + RefPtr(RefPtr &&ref) : m_ptr(nullptr) { *this = std::move(ref); } @@ -77,9 +71,11 @@ public: // unless you use static_cast (which will end up invoking the explicit // operator below). template - RefPtr(RefPtr&& ref, typename std::enable_if::value, U>::type* = nullptr) : - m_ptr(nullptr) - { + RefPtr( + RefPtr &&ref, + typename std::enable_if::value, U>::type * = + nullptr) + : m_ptr(nullptr) { *this = std::move(ref); } @@ -88,7 +84,7 @@ public: m_ptr = nullptr; } - RefPtr& operator=(const RefPtr& ref) { + RefPtr &operator=(const RefPtr &ref) { if (m_ptr != ref.m_ptr) { unrefIfNecessary(m_ptr); m_ptr = ref.m_ptr; @@ -99,7 +95,7 @@ public: // The STL assumes rvalue references are unique and for simplicity's sake, we // make the same assumption here, that &ref != this. - RefPtr& operator=(RefPtr&& ref) { + RefPtr &operator=(RefPtr &&ref) { unrefIfNecessary(m_ptr); m_ptr = ref.m_ptr; ref.m_ptr = nullptr; @@ -107,7 +103,7 @@ public: } template - RefPtr& operator=(RefPtr&& ref) { + RefPtr &operator=(RefPtr &&ref) { unrefIfNecessary(m_ptr); m_ptr = ref.m_ptr; ref.m_ptr = nullptr; @@ -119,20 +115,20 @@ public: m_ptr = nullptr; } - T* get() const { + T *get() const { return m_ptr; } - T* operator->() const { + T *operator->() const { return m_ptr; } - T& operator*() const { + T &operator*() const { return *m_ptr; } template - explicit operator RefPtr () const; + explicit operator RefPtr() const; explicit operator bool() const { return m_ptr ? true : false; @@ -145,128 +141,128 @@ public: // Creates a strong reference from a raw pointer, assuming that is already // referenced from some other RefPtr. This should be used sparingly. - static inline RefPtr assumeAlreadyReffed(T* ptr) { + static inline RefPtr assumeAlreadyReffed(T *ptr) { return RefPtr(ptr, ConstructionMode::External); } // Creates a strong reference from a raw pointer, assuming that it points to a // freshly-created object. See the documentation for RefPtr for usage. - static inline RefPtr adoptRef(T* ptr) { + static inline RefPtr adoptRef(T *ptr) { return RefPtr(ptr, ConstructionMode::Adopted); } -private: - enum class ConstructionMode { - Adopted, - External - }; + private: + enum class ConstructionMode { Adopted, External }; - RefPtr(T* ptr, ConstructionMode mode) : - m_ptr(ptr) - { - FBASSERTMSGF(ptr, "Got null pointer in %s construction mode", mode == ConstructionMode::Adopted ? "adopted" : "external"); + RefPtr(T *ptr, ConstructionMode mode) : m_ptr(ptr) { + FBASSERTMSGF( + ptr, + "Got null pointer in %s construction mode", + mode == ConstructionMode::Adopted ? "adopted" : "external"); ptr->ref(); if (mode == ConstructionMode::Adopted) { FBASSERT(ptr->hasOnlyOneRef()); } } - static inline void refIfNecessary(T* ptr) { + static inline void refIfNecessary(T *ptr) { if (ptr) { ptr->ref(); } } - static inline void unrefIfNecessary(T* ptr) { + static inline void unrefIfNecessary(T *ptr) { if (ptr) { ptr->unref(); } } - template friend class RefPtr; + template + friend class RefPtr; - T* m_ptr; + T *m_ptr; }; // Creates a strong reference from a raw pointer, assuming that is already // referenced from some other RefPtr and that it is non-null. This should be // used sparingly. template -static inline RefPtr assumeAlreadyReffed(T* ptr) { +static inline RefPtr assumeAlreadyReffed(T *ptr) { return RefPtr::assumeAlreadyReffed(ptr); } // As above, but tolerant of nullptr. template -static inline RefPtr assumeAlreadyReffedOrNull(T* ptr) { +static inline RefPtr assumeAlreadyReffedOrNull(T *ptr) { return ptr ? RefPtr::assumeAlreadyReffed(ptr) : nullptr; } // Creates a strong reference from a raw pointer, assuming that it points to a // freshly-created object. See the documentation for RefPtr for usage. template -static inline RefPtr adoptRef(T* ptr) { +static inline RefPtr adoptRef(T *ptr) { return RefPtr::adoptRef(ptr); } -template -static inline RefPtr createNew(Args&&... arguments) { +template +static inline RefPtr createNew(Args &&... arguments) { return RefPtr::adoptRef(new T(std::forward(arguments)...)); } -template template +template +template RefPtr::operator RefPtr() const { static_assert(std::is_base_of::value, "Invalid static cast"); - return assumeAlreadyReffedOrNull(static_cast(m_ptr)); + return assumeAlreadyReffedOrNull(static_cast(m_ptr)); } template -inline bool operator==(const RefPtr& a, const RefPtr& b) { +inline bool operator==(const RefPtr &a, const RefPtr &b) { return a.get() == b.get(); } template -inline bool operator!=(const RefPtr& a, const RefPtr& b) { +inline bool operator!=(const RefPtr &a, const RefPtr &b) { return a.get() != b.get(); } template -inline bool operator==(const RefPtr& ref, U* ptr) { +inline bool operator==(const RefPtr &ref, U *ptr) { return ref.get() == ptr; } template -inline bool operator!=(const RefPtr& ref, U* ptr) { +inline bool operator!=(const RefPtr &ref, U *ptr) { return ref.get() != ptr; } template -inline bool operator==(U* ptr, const RefPtr& ref) { +inline bool operator==(U *ptr, const RefPtr &ref) { return ref.get() == ptr; } template -inline bool operator!=(U* ptr, const RefPtr& ref) { +inline bool operator!=(U *ptr, const RefPtr &ref) { return ref.get() != ptr; } template -inline bool operator==(const RefPtr& ref, std::nullptr_t ptr) { +inline bool operator==(const RefPtr &ref, std::nullptr_t ptr) { return ref.get() == ptr; } template -inline bool operator!=(const RefPtr& ref, std::nullptr_t ptr) { +inline bool operator!=(const RefPtr &ref, std::nullptr_t ptr) { return ref.get() != ptr; } template -inline bool operator==(std::nullptr_t ptr, const RefPtr& ref) { +inline bool operator==(std::nullptr_t ptr, const RefPtr &ref) { return ref.get() == ptr; } template -inline bool operator!=(std::nullptr_t ptr, const RefPtr& ref) { +inline bool operator!=(std::nullptr_t ptr, const RefPtr &ref) { return ref.get() != ptr; } -} +} // namespace facebook diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/StaticInitialized.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/StaticInitialized.h index 566e02cd48b..839400f13a2 100644 --- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/StaticInitialized.h +++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/StaticInitialized.h @@ -17,22 +17,21 @@ namespace facebook { // initialization. template class StaticInitialized { -public: - constexpr StaticInitialized() : - m_instance(nullptr) - {} + public: + constexpr StaticInitialized() : m_instance(nullptr) {} - template - void initialize(Args&&... arguments) { + template + void initialize(Args &&... arguments) { FBASSERT(!m_instance); m_instance = new T(std::forward(arguments)...); } - T* operator->() const { + T *operator->() const { return m_instance; } -private: - T* m_instance; + + private: + T *m_instance; }; -} +} // namespace facebook diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/ThreadLocal.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/ThreadLocal.h index 675950fcb3d..3182fe297dc 100644 --- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/ThreadLocal.h +++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/ThreadLocal.h @@ -7,8 +7,8 @@ #pragma once -#include #include +#include #include @@ -32,25 +32,21 @@ namespace facebook { * So, syntax-wise it's similar to pointers. T can be primitive types, and if * it's a class, there has to be a default constructor. */ -template +template class ThreadLocal { -public: + public: /** * Constructor that has to be called from a thread-neutral place. */ - ThreadLocal() : - m_key(0), - m_cleanup(OnThreadExit) { + ThreadLocal() : m_key(0), m_cleanup(OnThreadExit) { initialize(); } /** * As above but with a custom cleanup function */ - typedef void (*CleanupFunction)(void* obj); - explicit ThreadLocal(CleanupFunction cleanup) : - m_key(0), - m_cleanup(cleanup) { + typedef void (*CleanupFunction)(void *obj); + explicit ThreadLocal(CleanupFunction cleanup) : m_key(0), m_cleanup(cleanup) { FBASSERT(cleanup); initialize(); } @@ -67,17 +63,17 @@ public: } T *get() const { - return (T*)pthread_getspecific(m_key); + return (T *)pthread_getspecific(m_key); } - T* release() { - T* obj = get(); + T *release() { + T *obj = get(); pthread_setspecific(m_key, NULL); return obj; } - void reset(T* other = NULL) { - T* old = (T*)pthread_getspecific(m_key); + void reset(T *other = NULL) { + T *old = (T *)pthread_getspecific(m_key); if (old != other) { FBASSERT(m_cleanup); m_cleanup(old); @@ -85,27 +81,27 @@ public: } } -private: + private: void initialize() { int ret = pthread_key_create(&m_key, m_cleanup); if (ret != 0) { const char *msg = "(unknown error)"; switch (ret) { - case EAGAIN: - msg = "PTHREAD_KEYS_MAX (1024) is exceeded"; - break; - case ENOMEM: - msg = "Out-of-memory"; - break; + case EAGAIN: + msg = "PTHREAD_KEYS_MAX (1024) is exceeded"; + break; + case ENOMEM: + msg = "Out-of-memory"; + break; } - (void) msg; + (void)msg; FBASSERTMSGF(0, "pthread_key_create failed: %d %s", ret, msg); } } static void OnThreadExit(void *obj) { if (NULL != obj) { - delete (T*)obj; + delete (T *)obj; } } @@ -113,4 +109,4 @@ private: CleanupFunction m_cleanup; }; -} +} // namespace facebook diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/assert.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/assert.h index a6b747f7f08..fcd284b1b69 100644 --- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/assert.h +++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/assert.h @@ -14,20 +14,29 @@ namespace facebook { #define ENABLE_FBASSERT 1 #if ENABLE_FBASSERT -#define FBASSERTMSGF(expr, msg, ...) !(expr) ? facebook::assertInternal("Assert (%s:%d): " msg, __FILE__, __LINE__, ##__VA_ARGS__) : (void) 0 +#define FBASSERTMSGF(expr, msg, ...) \ + !(expr) ? facebook::assertInternal( \ + "Assert (%s:%d): " msg, __FILE__, __LINE__, ##__VA_ARGS__) \ + : (void)0 #else #define FBASSERTMSGF(expr, msg, ...) #endif // ENABLE_FBASSERT #define FBASSERT(expr) FBASSERTMSGF(expr, "%s", #expr) -#define FBCRASH(msg, ...) facebook::assertInternal("Fatal error (%s:%d): " msg, __FILE__, __LINE__, ##__VA_ARGS__) -#define FBUNREACHABLE() facebook::assertInternal("This code should be unreachable (%s:%d)", __FILE__, __LINE__) +#define FBCRASH(msg, ...) \ + facebook::assertInternal( \ + "Fatal error (%s:%d): " msg, __FILE__, __LINE__, ##__VA_ARGS__) +#define FBUNREACHABLE() \ + facebook::assertInternal( \ + "This code should be unreachable (%s:%d)", __FILE__, __LINE__) -FBEXPORT void assertInternal(const char* formatstr, ...) __attribute__((noreturn)); +FBEXPORT void assertInternal(const char *formatstr, ...) + __attribute__((noreturn)); -// This allows storing the assert message before the current process terminates due to a crash -typedef void (*AssertHandler)(const char* message); +// This allows storing the assert message before the current process terminates +// due to a crash +typedef void (*AssertHandler)(const char *message); void setAssertHandler(AssertHandler assertHandler); } // namespace facebook diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/log.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/log.h index e26e716bf1f..ecc2a1f5a17 100644 --- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/log.h +++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/log.h @@ -308,7 +308,7 @@ int __android_log_print(int prio, const char *tag, const char *fmt, ...) #define IF_FBLOG(priority, tag) if (fb_testLog(ANDROID_##priority, tag)) #endif -typedef void (*LogHandler)(int priority, const char* tag, const char* message); +typedef void (*LogHandler)(int priority, const char *tag, const char *message); FBEXPORT void setLogHandler(LogHandler logHandler); /* @@ -316,7 +316,7 @@ FBEXPORT void setLogHandler(LogHandler logHandler); * * The stuff in the rest of this file should not be used directly. */ -FBEXPORT int fb_printLog(int prio, const char* tag, const char* fmt, ...) +FBEXPORT int fb_printLog(int prio, const char *tag, const char *fmt, ...) #if defined(__GNUC__) __attribute__((format(printf, 3, 4))) #endif @@ -338,8 +338,12 @@ FBEXPORT int fb_printLog(int prio, const char* tag, const char* fmt, ...) /* * FB extensions */ -void logPrintByDelims(int priority, const char* tag, const char* delims, - const char* msg, ...); +void logPrintByDelims( + int priority, + const char *tag, + const char *delims, + const char *msg, + ...); #ifdef __cplusplus } diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/noncopyable.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/noncopyable.h index 283f0fac991..48a3a004e97 100644 --- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/noncopyable.h +++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/noncopyable.h @@ -10,10 +10,11 @@ namespace facebook { struct noncopyable { - noncopyable(const noncopyable&) = delete; - noncopyable& operator=(const noncopyable&) = delete; -protected: + noncopyable(const noncopyable &) = delete; + noncopyable &operator=(const noncopyable &) = delete; + + protected: noncopyable() = default; }; -} +} // namespace facebook diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/nonmovable.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/nonmovable.h index 819f7193acc..7d483141f26 100644 --- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/nonmovable.h +++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/nonmovable.h @@ -10,10 +10,11 @@ namespace facebook { struct nonmovable { - nonmovable(nonmovable&&) = delete; - nonmovable& operator=(nonmovable&&) = delete; -protected: + nonmovable(nonmovable &&) = delete; + nonmovable &operator=(nonmovable &&) = delete; + + protected: nonmovable() = default; }; -} +} // namespace facebook diff --git a/ReactAndroid/src/main/jni/first-party/fb/log.cpp b/ReactAndroid/src/main/jni/first-party/fb/log.cpp index 7d2a70df03d..c2c5ae92687 100644 --- a/ReactAndroid/src/main/jni/first-party/fb/log.cpp +++ b/ReactAndroid/src/main/jni/first-party/fb/log.cpp @@ -17,7 +17,7 @@ void setLogHandler(LogHandler logHandler) { gLogHandler = logHandler; } -int fb_printLog(int prio, const char *tag, const char *fmt, ...) { +int fb_printLog(int prio, const char *tag, const char *fmt, ...) { char logBuffer[LOG_BUFFER_SIZE]; va_list va_args; @@ -25,38 +25,42 @@ int fb_printLog(int prio, const char *tag, const char *fmt, ...) { int result = vsnprintf(logBuffer, sizeof(logBuffer), fmt, va_args); va_end(va_args); if (gLogHandler != NULL) { - gLogHandler(prio, tag, logBuffer); + gLogHandler(prio, tag, logBuffer); } __android_log_write(prio, tag, logBuffer); return result; } -void logPrintByDelims(int priority, const char* tag, const char* delims, - const char* msg, ...) -{ - va_list ap; - char buf[32768]; - char* context; - char* tok; +void logPrintByDelims( + int priority, + const char *tag, + const char *delims, + const char *msg, + ...) { + va_list ap; + char buf[32768]; + char *context; + char *tok; - va_start(ap, msg); - vsnprintf(buf, sizeof(buf), msg, ap); - va_end(ap); + va_start(ap, msg); + vsnprintf(buf, sizeof(buf), msg, ap); + va_end(ap); - tok = strtok_r(buf, delims, &context); + tok = strtok_r(buf, delims, &context); - if (!tok) { - return; - } + if (!tok) { + return; + } - do { - __android_log_write(priority, tag, tok); - } while ((tok = strtok_r(NULL, delims, &context))); + do { + __android_log_write(priority, tag, tok); + } while ((tok = strtok_r(NULL, delims, &context))); } #ifndef ANDROID -// Implementations of the basic android logging functions for non-android platforms. +// Implementations of the basic android logging functions for non-android +// platforms. static char logTagChar(int prio) { switch (prio) { @@ -84,7 +88,7 @@ int __android_log_write(int prio, const char *tag, const char *text) { return fprintf(stderr, "[%c/%.16s] %s\n", logTagChar(prio), tag, text); } -int __android_log_print(int prio, const char *tag, const char *fmt, ...) { +int __android_log_print(int prio, const char *tag, const char *fmt, ...) { va_list ap; va_start(ap, fmt); diff --git a/ReactAndroid/src/main/jni/first-party/fbgloginit/fb/glog_init.h b/ReactAndroid/src/main/jni/first-party/fbgloginit/fb/glog_init.h index 116fe03f1b2..d1762008b66 100644 --- a/ReactAndroid/src/main/jni/first-party/fbgloginit/fb/glog_init.h +++ b/ReactAndroid/src/main/jni/first-party/fbgloginit/fb/glog_init.h @@ -9,8 +9,10 @@ #include -namespace facebook { namespace gloginit { +namespace facebook { +namespace gloginit { -void initialize(const char* tag = "ReactNativeJNI"); +void initialize(const char *tag = "ReactNativeJNI"); -}} +} +} // namespace facebook diff --git a/ReactAndroid/src/main/jni/first-party/fbgloginit/glog_init.cpp b/ReactAndroid/src/main/jni/first-party/fbgloginit/glog_init.cpp index 345209488ea..8e781859e5d 100644 --- a/ReactAndroid/src/main/jni/first-party/fbgloginit/glog_init.cpp +++ b/ReactAndroid/src/main/jni/first-party/fbgloginit/glog_init.cpp @@ -19,16 +19,16 @@ static int toAndroidLevel(google::LogSeverity severity) { switch (severity) { - case google::GLOG_INFO: - return ANDROID_LOG_INFO; - case google::GLOG_WARNING: - return ANDROID_LOG_WARN; - case google::GLOG_ERROR: - return ANDROID_LOG_ERROR; - case google::GLOG_FATAL: - return ANDROID_LOG_FATAL; - default: - return ANDROID_LOG_FATAL; + case google::GLOG_INFO: + return ANDROID_LOG_INFO; + case google::GLOG_WARNING: + return ANDROID_LOG_WARN; + case google::GLOG_ERROR: + return ANDROID_LOG_ERROR; + case google::GLOG_FATAL: + return ANDROID_LOG_FATAL; + default: + return ANDROID_LOG_FATAL; } } @@ -39,19 +39,15 @@ class LogcatSink : public google::LogSink { public: void send( google::LogSeverity severity, - const char* full_filename, - const char* base_filename, + const char *full_filename, + const char *base_filename, int line, - const struct ::tm* tm_time, - const char* message, + const struct ::tm *tm_time, + const char *message, size_t message_len) override { auto level = toAndroidLevel(severity); __android_log_print( - level, - base_filename, - "%.*s", - (int)message_len, - message); + level, base_filename, "%.*s", (int)message_len, message); } }; @@ -66,23 +62,18 @@ class TaggedLogcatSink : public google::LogSink { void send( google::LogSeverity severity, - const char* full_filename, - const char* base_filename, + const char *full_filename, + const char *base_filename, int line, - const struct ::tm* tm_time, - const char* message, + const struct ::tm *tm_time, + const char *message, size_t message_len) override { auto level = toAndroidLevel(severity); - __android_log_print( - level, - tag_.c_str(), - "%.*s", - (int)message_len, - message); + __android_log_print(level, tag_.c_str(), "%.*s", (int)message_len, message); } }; -static google::LogSink* make_sink(const std::string& tag) { +static google::LogSink *make_sink(const std::string &tag) { if (tag.empty()) { return new LogcatSink{}; } else { @@ -90,7 +81,7 @@ static google::LogSink* make_sink(const std::string& tag) { } } -static void sendGlogOutputToLogcat(const char* tag) { +static void sendGlogOutputToLogcat(const char *tag) { google::AddLogSink(make_sink(tag)); // Disable logging to files @@ -101,7 +92,8 @@ static void sendGlogOutputToLogcat(const char* tag) { #endif // __ANDROID__ -static void lastResort(const char* tag, const char* msg, const char* arg = nullptr) { +static void +lastResort(const char *tag, const char *msg, const char *arg = nullptr) { #ifdef __ANDROID__ if (!arg) { __android_log_write(ANDROID_LOG_ERROR, tag, msg); @@ -117,9 +109,10 @@ static void lastResort(const char* tag, const char* msg, const char* arg = nullp #endif } -namespace facebook { namespace gloginit { +namespace facebook { +namespace gloginit { -void initialize(const char* tag) { +void initialize(const char *tag) { static std::once_flag flag{}; static auto failed = false; @@ -130,7 +123,7 @@ void initialize(const char* tag) { #ifdef __ANDROID__ sendGlogOutputToLogcat(tag); #endif - } catch (std::exception& ex) { + } catch (std::exception &ex) { lastResort(tag, "Failed to initialize glog", ex.what()); failed = true; } catch (...) { @@ -144,4 +137,5 @@ void initialize(const char* tag) { } } -}} +} // namespace gloginit +} // namespace facebook diff --git a/ReactAndroid/src/main/jni/first-party/jni-hack/real/jni.h b/ReactAndroid/src/main/jni/first-party/jni-hack/real/jni.h index 1c2fb0cd7c5..e8ca17b36f7 100644 --- a/ReactAndroid/src/main/jni/first-party/jni-hack/real/jni.h +++ b/ReactAndroid/src/main/jni/first-party/jni-hack/real/jni.h @@ -28,17 +28,17 @@ #include /* Primitive types that match up with Java equivalents. */ -typedef uint8_t jboolean; /* unsigned 8 bits */ -typedef int8_t jbyte; /* signed 8 bits */ -typedef uint16_t jchar; /* unsigned 16 bits */ -typedef int16_t jshort; /* signed 16 bits */ -typedef int32_t jint; /* signed 32 bits */ -typedef int64_t jlong; /* signed 64 bits */ -typedef float jfloat; /* 32-bit IEEE 754 */ -typedef double jdouble; /* 64-bit IEEE 754 */ +typedef uint8_t jboolean; /* unsigned 8 bits */ +typedef int8_t jbyte; /* signed 8 bits */ +typedef uint16_t jchar; /* unsigned 16 bits */ +typedef int16_t jshort; /* signed 16 bits */ +typedef int32_t jint; /* signed 32 bits */ +typedef int64_t jlong; /* signed 64 bits */ +typedef float jfloat; /* 32-bit IEEE 754 */ +typedef double jdouble; /* 64-bit IEEE 754 */ /* "cardinal indices and sizes" */ -typedef jint jsize; +typedef jint jsize; #ifdef __cplusplus /* @@ -59,427 +59,494 @@ class _jfloatArray : public _jarray {}; class _jdoubleArray : public _jarray {}; class _jthrowable : public _jobject {}; -typedef _jobject* jobject; -typedef _jclass* jclass; -typedef _jstring* jstring; -typedef _jarray* jarray; -typedef _jobjectArray* jobjectArray; -typedef _jbooleanArray* jbooleanArray; -typedef _jbyteArray* jbyteArray; -typedef _jcharArray* jcharArray; -typedef _jshortArray* jshortArray; -typedef _jintArray* jintArray; -typedef _jlongArray* jlongArray; -typedef _jfloatArray* jfloatArray; -typedef _jdoubleArray* jdoubleArray; -typedef _jthrowable* jthrowable; -typedef _jobject* jweak; - +typedef _jobject *jobject; +typedef _jclass *jclass; +typedef _jstring *jstring; +typedef _jarray *jarray; +typedef _jobjectArray *jobjectArray; +typedef _jbooleanArray *jbooleanArray; +typedef _jbyteArray *jbyteArray; +typedef _jcharArray *jcharArray; +typedef _jshortArray *jshortArray; +typedef _jintArray *jintArray; +typedef _jlongArray *jlongArray; +typedef _jfloatArray *jfloatArray; +typedef _jdoubleArray *jdoubleArray; +typedef _jthrowable *jthrowable; +typedef _jobject *jweak; #else /* not __cplusplus */ /* * Reference types, in C. */ -typedef void* jobject; -typedef jobject jclass; -typedef jobject jstring; -typedef jobject jarray; -typedef jarray jobjectArray; -typedef jarray jbooleanArray; -typedef jarray jbyteArray; -typedef jarray jcharArray; -typedef jarray jshortArray; -typedef jarray jintArray; -typedef jarray jlongArray; -typedef jarray jfloatArray; -typedef jarray jdoubleArray; -typedef jobject jthrowable; -typedef jobject jweak; +typedef void *jobject; +typedef jobject jclass; +typedef jobject jstring; +typedef jobject jarray; +typedef jarray jobjectArray; +typedef jarray jbooleanArray; +typedef jarray jbyteArray; +typedef jarray jcharArray; +typedef jarray jshortArray; +typedef jarray jintArray; +typedef jarray jlongArray; +typedef jarray jfloatArray; +typedef jarray jdoubleArray; +typedef jobject jthrowable; +typedef jobject jweak; #endif /* not __cplusplus */ -struct _jfieldID; /* opaque structure */ -typedef struct _jfieldID* jfieldID; /* field IDs */ +struct _jfieldID; /* opaque structure */ +typedef struct _jfieldID *jfieldID; /* field IDs */ -struct _jmethodID; /* opaque structure */ -typedef struct _jmethodID* jmethodID; /* method IDs */ +struct _jmethodID; /* opaque structure */ +typedef struct _jmethodID *jmethodID; /* method IDs */ struct JNIInvokeInterface; typedef union jvalue { - jboolean z; - jbyte b; - jchar c; - jshort s; - jint i; - jlong j; - jfloat f; - jdouble d; - jobject l; + jboolean z; + jbyte b; + jchar c; + jshort s; + jint i; + jlong j; + jfloat f; + jdouble d; + jobject l; } jvalue; typedef enum jobjectRefType { - JNIInvalidRefType = 0, - JNILocalRefType = 1, - JNIGlobalRefType = 2, - JNIWeakGlobalRefType = 3 + JNIInvalidRefType = 0, + JNILocalRefType = 1, + JNIGlobalRefType = 2, + JNIWeakGlobalRefType = 3 } jobjectRefType; typedef struct { - const char* name; - const char* signature; - void* fnPtr; + const char *name; + const char *signature; + void *fnPtr; } JNINativeMethod; struct _JNIEnv; struct _JavaVM; -typedef const struct JNINativeInterface* C_JNIEnv; +typedef const struct JNINativeInterface *C_JNIEnv; #if defined(__cplusplus) typedef _JNIEnv JNIEnv; typedef _JavaVM JavaVM; #else -typedef const struct JNINativeInterface* JNIEnv; -typedef const struct JNIInvokeInterface* JavaVM; +typedef const struct JNINativeInterface *JNIEnv; +typedef const struct JNIInvokeInterface *JavaVM; #endif /* * Table of interface function pointers. */ struct JNINativeInterface { - void* reserved0; - void* reserved1; - void* reserved2; - void* reserved3; + void *reserved0; + void *reserved1; + void *reserved2; + void *reserved3; - jint (*GetVersion)(JNIEnv *); + jint (*GetVersion)(JNIEnv *); - jclass (*DefineClass)(JNIEnv*, const char*, jobject, const jbyte*, - jsize); - jclass (*FindClass)(JNIEnv*, const char*); + jclass (*DefineClass)(JNIEnv *, const char *, jobject, const jbyte *, jsize); + jclass (*FindClass)(JNIEnv *, const char *); - jmethodID (*FromReflectedMethod)(JNIEnv*, jobject); - jfieldID (*FromReflectedField)(JNIEnv*, jobject); - /* spec doesn't show jboolean parameter */ - jobject (*ToReflectedMethod)(JNIEnv*, jclass, jmethodID, jboolean); + jmethodID (*FromReflectedMethod)(JNIEnv *, jobject); + jfieldID (*FromReflectedField)(JNIEnv *, jobject); + /* spec doesn't show jboolean parameter */ + jobject (*ToReflectedMethod)(JNIEnv *, jclass, jmethodID, jboolean); - jclass (*GetSuperclass)(JNIEnv*, jclass); - jboolean (*IsAssignableFrom)(JNIEnv*, jclass, jclass); + jclass (*GetSuperclass)(JNIEnv *, jclass); + jboolean (*IsAssignableFrom)(JNIEnv *, jclass, jclass); - /* spec doesn't show jboolean parameter */ - jobject (*ToReflectedField)(JNIEnv*, jclass, jfieldID, jboolean); + /* spec doesn't show jboolean parameter */ + jobject (*ToReflectedField)(JNIEnv *, jclass, jfieldID, jboolean); - jint (*Throw)(JNIEnv*, jthrowable); - jint (*ThrowNew)(JNIEnv *, jclass, const char *); - jthrowable (*ExceptionOccurred)(JNIEnv*); - void (*ExceptionDescribe)(JNIEnv*); - void (*ExceptionClear)(JNIEnv*); - void (*FatalError)(JNIEnv*, const char*); + jint (*Throw)(JNIEnv *, jthrowable); + jint (*ThrowNew)(JNIEnv *, jclass, const char *); + jthrowable (*ExceptionOccurred)(JNIEnv *); + void (*ExceptionDescribe)(JNIEnv *); + void (*ExceptionClear)(JNIEnv *); + void (*FatalError)(JNIEnv *, const char *); - jint (*PushLocalFrame)(JNIEnv*, jint); - jobject (*PopLocalFrame)(JNIEnv*, jobject); + jint (*PushLocalFrame)(JNIEnv *, jint); + jobject (*PopLocalFrame)(JNIEnv *, jobject); - jobject (*NewGlobalRef)(JNIEnv*, jobject); - void (*DeleteGlobalRef)(JNIEnv*, jobject); - void (*DeleteLocalRef)(JNIEnv*, jobject); - jboolean (*IsSameObject)(JNIEnv*, jobject, jobject); + jobject (*NewGlobalRef)(JNIEnv *, jobject); + void (*DeleteGlobalRef)(JNIEnv *, jobject); + void (*DeleteLocalRef)(JNIEnv *, jobject); + jboolean (*IsSameObject)(JNIEnv *, jobject, jobject); - jobject (*NewLocalRef)(JNIEnv*, jobject); - jint (*EnsureLocalCapacity)(JNIEnv*, jint); + jobject (*NewLocalRef)(JNIEnv *, jobject); + jint (*EnsureLocalCapacity)(JNIEnv *, jint); - jobject (*AllocObject)(JNIEnv*, jclass); - jobject (*NewObject)(JNIEnv*, jclass, jmethodID, ...); - jobject (*NewObjectV)(JNIEnv*, jclass, jmethodID, va_list); - jobject (*NewObjectA)(JNIEnv*, jclass, jmethodID, jvalue*); + jobject (*AllocObject)(JNIEnv *, jclass); + jobject (*NewObject)(JNIEnv *, jclass, jmethodID, ...); + jobject (*NewObjectV)(JNIEnv *, jclass, jmethodID, va_list); + jobject (*NewObjectA)(JNIEnv *, jclass, jmethodID, jvalue *); - jclass (*GetObjectClass)(JNIEnv*, jobject); - jboolean (*IsInstanceOf)(JNIEnv*, jobject, jclass); - jmethodID (*GetMethodID)(JNIEnv*, jclass, const char*, const char*); + jclass (*GetObjectClass)(JNIEnv *, jobject); + jboolean (*IsInstanceOf)(JNIEnv *, jobject, jclass); + jmethodID (*GetMethodID)(JNIEnv *, jclass, const char *, const char *); - jobject (*CallObjectMethod)(JNIEnv*, jobject, jmethodID, ...); - jobject (*CallObjectMethodV)(JNIEnv*, jobject, jmethodID, va_list); - jobject (*CallObjectMethodA)(JNIEnv*, jobject, jmethodID, jvalue*); - jboolean (*CallBooleanMethod)(JNIEnv*, jobject, jmethodID, ...); - jboolean (*CallBooleanMethodV)(JNIEnv*, jobject, jmethodID, va_list); - jboolean (*CallBooleanMethodA)(JNIEnv*, jobject, jmethodID, jvalue*); - jbyte (*CallByteMethod)(JNIEnv*, jobject, jmethodID, ...); - jbyte (*CallByteMethodV)(JNIEnv*, jobject, jmethodID, va_list); - jbyte (*CallByteMethodA)(JNIEnv*, jobject, jmethodID, jvalue*); - jchar (*CallCharMethod)(JNIEnv*, jobject, jmethodID, ...); - jchar (*CallCharMethodV)(JNIEnv*, jobject, jmethodID, va_list); - jchar (*CallCharMethodA)(JNIEnv*, jobject, jmethodID, jvalue*); - jshort (*CallShortMethod)(JNIEnv*, jobject, jmethodID, ...); - jshort (*CallShortMethodV)(JNIEnv*, jobject, jmethodID, va_list); - jshort (*CallShortMethodA)(JNIEnv*, jobject, jmethodID, jvalue*); - jint (*CallIntMethod)(JNIEnv*, jobject, jmethodID, ...); - jint (*CallIntMethodV)(JNIEnv*, jobject, jmethodID, va_list); - jint (*CallIntMethodA)(JNIEnv*, jobject, jmethodID, jvalue*); - jlong (*CallLongMethod)(JNIEnv*, jobject, jmethodID, ...); - jlong (*CallLongMethodV)(JNIEnv*, jobject, jmethodID, va_list); - jlong (*CallLongMethodA)(JNIEnv*, jobject, jmethodID, jvalue*); - jfloat (*CallFloatMethod)(JNIEnv*, jobject, jmethodID, ...); - jfloat (*CallFloatMethodV)(JNIEnv*, jobject, jmethodID, va_list); - jfloat (*CallFloatMethodA)(JNIEnv*, jobject, jmethodID, jvalue*); - jdouble (*CallDoubleMethod)(JNIEnv*, jobject, jmethodID, ...); - jdouble (*CallDoubleMethodV)(JNIEnv*, jobject, jmethodID, va_list); - jdouble (*CallDoubleMethodA)(JNIEnv*, jobject, jmethodID, jvalue*); - void (*CallVoidMethod)(JNIEnv*, jobject, jmethodID, ...); - void (*CallVoidMethodV)(JNIEnv*, jobject, jmethodID, va_list); - void (*CallVoidMethodA)(JNIEnv*, jobject, jmethodID, jvalue*); + jobject (*CallObjectMethod)(JNIEnv *, jobject, jmethodID, ...); + jobject (*CallObjectMethodV)(JNIEnv *, jobject, jmethodID, va_list); + jobject (*CallObjectMethodA)(JNIEnv *, jobject, jmethodID, jvalue *); + jboolean (*CallBooleanMethod)(JNIEnv *, jobject, jmethodID, ...); + jboolean (*CallBooleanMethodV)(JNIEnv *, jobject, jmethodID, va_list); + jboolean (*CallBooleanMethodA)(JNIEnv *, jobject, jmethodID, jvalue *); + jbyte (*CallByteMethod)(JNIEnv *, jobject, jmethodID, ...); + jbyte (*CallByteMethodV)(JNIEnv *, jobject, jmethodID, va_list); + jbyte (*CallByteMethodA)(JNIEnv *, jobject, jmethodID, jvalue *); + jchar (*CallCharMethod)(JNIEnv *, jobject, jmethodID, ...); + jchar (*CallCharMethodV)(JNIEnv *, jobject, jmethodID, va_list); + jchar (*CallCharMethodA)(JNIEnv *, jobject, jmethodID, jvalue *); + jshort (*CallShortMethod)(JNIEnv *, jobject, jmethodID, ...); + jshort (*CallShortMethodV)(JNIEnv *, jobject, jmethodID, va_list); + jshort (*CallShortMethodA)(JNIEnv *, jobject, jmethodID, jvalue *); + jint (*CallIntMethod)(JNIEnv *, jobject, jmethodID, ...); + jint (*CallIntMethodV)(JNIEnv *, jobject, jmethodID, va_list); + jint (*CallIntMethodA)(JNIEnv *, jobject, jmethodID, jvalue *); + jlong (*CallLongMethod)(JNIEnv *, jobject, jmethodID, ...); + jlong (*CallLongMethodV)(JNIEnv *, jobject, jmethodID, va_list); + jlong (*CallLongMethodA)(JNIEnv *, jobject, jmethodID, jvalue *); + jfloat (*CallFloatMethod)(JNIEnv *, jobject, jmethodID, ...); + jfloat (*CallFloatMethodV)(JNIEnv *, jobject, jmethodID, va_list); + jfloat (*CallFloatMethodA)(JNIEnv *, jobject, jmethodID, jvalue *); + jdouble (*CallDoubleMethod)(JNIEnv *, jobject, jmethodID, ...); + jdouble (*CallDoubleMethodV)(JNIEnv *, jobject, jmethodID, va_list); + jdouble (*CallDoubleMethodA)(JNIEnv *, jobject, jmethodID, jvalue *); + void (*CallVoidMethod)(JNIEnv *, jobject, jmethodID, ...); + void (*CallVoidMethodV)(JNIEnv *, jobject, jmethodID, va_list); + void (*CallVoidMethodA)(JNIEnv *, jobject, jmethodID, jvalue *); - jobject (*CallNonvirtualObjectMethod)(JNIEnv*, jobject, jclass, - jmethodID, ...); - jobject (*CallNonvirtualObjectMethodV)(JNIEnv*, jobject, jclass, - jmethodID, va_list); - jobject (*CallNonvirtualObjectMethodA)(JNIEnv*, jobject, jclass, - jmethodID, jvalue*); - jboolean (*CallNonvirtualBooleanMethod)(JNIEnv*, jobject, jclass, - jmethodID, ...); - jboolean (*CallNonvirtualBooleanMethodV)(JNIEnv*, jobject, jclass, - jmethodID, va_list); - jboolean (*CallNonvirtualBooleanMethodA)(JNIEnv*, jobject, jclass, - jmethodID, jvalue*); - jbyte (*CallNonvirtualByteMethod)(JNIEnv*, jobject, jclass, - jmethodID, ...); - jbyte (*CallNonvirtualByteMethodV)(JNIEnv*, jobject, jclass, - jmethodID, va_list); - jbyte (*CallNonvirtualByteMethodA)(JNIEnv*, jobject, jclass, - jmethodID, jvalue*); - jchar (*CallNonvirtualCharMethod)(JNIEnv*, jobject, jclass, - jmethodID, ...); - jchar (*CallNonvirtualCharMethodV)(JNIEnv*, jobject, jclass, - jmethodID, va_list); - jchar (*CallNonvirtualCharMethodA)(JNIEnv*, jobject, jclass, - jmethodID, jvalue*); - jshort (*CallNonvirtualShortMethod)(JNIEnv*, jobject, jclass, - jmethodID, ...); - jshort (*CallNonvirtualShortMethodV)(JNIEnv*, jobject, jclass, - jmethodID, va_list); - jshort (*CallNonvirtualShortMethodA)(JNIEnv*, jobject, jclass, - jmethodID, jvalue*); - jint (*CallNonvirtualIntMethod)(JNIEnv*, jobject, jclass, - jmethodID, ...); - jint (*CallNonvirtualIntMethodV)(JNIEnv*, jobject, jclass, - jmethodID, va_list); - jint (*CallNonvirtualIntMethodA)(JNIEnv*, jobject, jclass, - jmethodID, jvalue*); - jlong (*CallNonvirtualLongMethod)(JNIEnv*, jobject, jclass, - jmethodID, ...); - jlong (*CallNonvirtualLongMethodV)(JNIEnv*, jobject, jclass, - jmethodID, va_list); - jlong (*CallNonvirtualLongMethodA)(JNIEnv*, jobject, jclass, - jmethodID, jvalue*); - jfloat (*CallNonvirtualFloatMethod)(JNIEnv*, jobject, jclass, - jmethodID, ...); - jfloat (*CallNonvirtualFloatMethodV)(JNIEnv*, jobject, jclass, - jmethodID, va_list); - jfloat (*CallNonvirtualFloatMethodA)(JNIEnv*, jobject, jclass, - jmethodID, jvalue*); - jdouble (*CallNonvirtualDoubleMethod)(JNIEnv*, jobject, jclass, - jmethodID, ...); - jdouble (*CallNonvirtualDoubleMethodV)(JNIEnv*, jobject, jclass, - jmethodID, va_list); - jdouble (*CallNonvirtualDoubleMethodA)(JNIEnv*, jobject, jclass, - jmethodID, jvalue*); - void (*CallNonvirtualVoidMethod)(JNIEnv*, jobject, jclass, - jmethodID, ...); - void (*CallNonvirtualVoidMethodV)(JNIEnv*, jobject, jclass, - jmethodID, va_list); - void (*CallNonvirtualVoidMethodA)(JNIEnv*, jobject, jclass, - jmethodID, jvalue*); + jobject ( + *CallNonvirtualObjectMethod)(JNIEnv *, jobject, jclass, jmethodID, ...); + jobject (*CallNonvirtualObjectMethodV)( + JNIEnv *, + jobject, + jclass, + jmethodID, + va_list); + jobject (*CallNonvirtualObjectMethodA)( + JNIEnv *, + jobject, + jclass, + jmethodID, + jvalue *); + jboolean ( + *CallNonvirtualBooleanMethod)(JNIEnv *, jobject, jclass, jmethodID, ...); + jboolean (*CallNonvirtualBooleanMethodV)( + JNIEnv *, + jobject, + jclass, + jmethodID, + va_list); + jboolean (*CallNonvirtualBooleanMethodA)( + JNIEnv *, + jobject, + jclass, + jmethodID, + jvalue *); + jbyte (*CallNonvirtualByteMethod)(JNIEnv *, jobject, jclass, jmethodID, ...); + jbyte (*CallNonvirtualByteMethodV)( + JNIEnv *, + jobject, + jclass, + jmethodID, + va_list); + jbyte (*CallNonvirtualByteMethodA)( + JNIEnv *, + jobject, + jclass, + jmethodID, + jvalue *); + jchar (*CallNonvirtualCharMethod)(JNIEnv *, jobject, jclass, jmethodID, ...); + jchar (*CallNonvirtualCharMethodV)( + JNIEnv *, + jobject, + jclass, + jmethodID, + va_list); + jchar (*CallNonvirtualCharMethodA)( + JNIEnv *, + jobject, + jclass, + jmethodID, + jvalue *); + jshort ( + *CallNonvirtualShortMethod)(JNIEnv *, jobject, jclass, jmethodID, ...); + jshort (*CallNonvirtualShortMethodV)( + JNIEnv *, + jobject, + jclass, + jmethodID, + va_list); + jshort (*CallNonvirtualShortMethodA)( + JNIEnv *, + jobject, + jclass, + jmethodID, + jvalue *); + jint (*CallNonvirtualIntMethod)(JNIEnv *, jobject, jclass, jmethodID, ...); + jint ( + *CallNonvirtualIntMethodV)(JNIEnv *, jobject, jclass, jmethodID, va_list); + jint (*CallNonvirtualIntMethodA)( + JNIEnv *, + jobject, + jclass, + jmethodID, + jvalue *); + jlong (*CallNonvirtualLongMethod)(JNIEnv *, jobject, jclass, jmethodID, ...); + jlong (*CallNonvirtualLongMethodV)( + JNIEnv *, + jobject, + jclass, + jmethodID, + va_list); + jlong (*CallNonvirtualLongMethodA)( + JNIEnv *, + jobject, + jclass, + jmethodID, + jvalue *); + jfloat ( + *CallNonvirtualFloatMethod)(JNIEnv *, jobject, jclass, jmethodID, ...); + jfloat (*CallNonvirtualFloatMethodV)( + JNIEnv *, + jobject, + jclass, + jmethodID, + va_list); + jfloat (*CallNonvirtualFloatMethodA)( + JNIEnv *, + jobject, + jclass, + jmethodID, + jvalue *); + jdouble ( + *CallNonvirtualDoubleMethod)(JNIEnv *, jobject, jclass, jmethodID, ...); + jdouble (*CallNonvirtualDoubleMethodV)( + JNIEnv *, + jobject, + jclass, + jmethodID, + va_list); + jdouble (*CallNonvirtualDoubleMethodA)( + JNIEnv *, + jobject, + jclass, + jmethodID, + jvalue *); + void (*CallNonvirtualVoidMethod)(JNIEnv *, jobject, jclass, jmethodID, ...); + void (*CallNonvirtualVoidMethodV)( + JNIEnv *, + jobject, + jclass, + jmethodID, + va_list); + void (*CallNonvirtualVoidMethodA)( + JNIEnv *, + jobject, + jclass, + jmethodID, + jvalue *); - jfieldID (*GetFieldID)(JNIEnv*, jclass, const char*, const char*); + jfieldID (*GetFieldID)(JNIEnv *, jclass, const char *, const char *); - jobject (*GetObjectField)(JNIEnv*, jobject, jfieldID); - jboolean (*GetBooleanField)(JNIEnv*, jobject, jfieldID); - jbyte (*GetByteField)(JNIEnv*, jobject, jfieldID); - jchar (*GetCharField)(JNIEnv*, jobject, jfieldID); - jshort (*GetShortField)(JNIEnv*, jobject, jfieldID); - jint (*GetIntField)(JNIEnv*, jobject, jfieldID); - jlong (*GetLongField)(JNIEnv*, jobject, jfieldID); - jfloat (*GetFloatField)(JNIEnv*, jobject, jfieldID); - jdouble (*GetDoubleField)(JNIEnv*, jobject, jfieldID); + jobject (*GetObjectField)(JNIEnv *, jobject, jfieldID); + jboolean (*GetBooleanField)(JNIEnv *, jobject, jfieldID); + jbyte (*GetByteField)(JNIEnv *, jobject, jfieldID); + jchar (*GetCharField)(JNIEnv *, jobject, jfieldID); + jshort (*GetShortField)(JNIEnv *, jobject, jfieldID); + jint (*GetIntField)(JNIEnv *, jobject, jfieldID); + jlong (*GetLongField)(JNIEnv *, jobject, jfieldID); + jfloat (*GetFloatField)(JNIEnv *, jobject, jfieldID); + jdouble (*GetDoubleField)(JNIEnv *, jobject, jfieldID); - void (*SetObjectField)(JNIEnv*, jobject, jfieldID, jobject); - void (*SetBooleanField)(JNIEnv*, jobject, jfieldID, jboolean); - void (*SetByteField)(JNIEnv*, jobject, jfieldID, jbyte); - void (*SetCharField)(JNIEnv*, jobject, jfieldID, jchar); - void (*SetShortField)(JNIEnv*, jobject, jfieldID, jshort); - void (*SetIntField)(JNIEnv*, jobject, jfieldID, jint); - void (*SetLongField)(JNIEnv*, jobject, jfieldID, jlong); - void (*SetFloatField)(JNIEnv*, jobject, jfieldID, jfloat); - void (*SetDoubleField)(JNIEnv*, jobject, jfieldID, jdouble); + void (*SetObjectField)(JNIEnv *, jobject, jfieldID, jobject); + void (*SetBooleanField)(JNIEnv *, jobject, jfieldID, jboolean); + void (*SetByteField)(JNIEnv *, jobject, jfieldID, jbyte); + void (*SetCharField)(JNIEnv *, jobject, jfieldID, jchar); + void (*SetShortField)(JNIEnv *, jobject, jfieldID, jshort); + void (*SetIntField)(JNIEnv *, jobject, jfieldID, jint); + void (*SetLongField)(JNIEnv *, jobject, jfieldID, jlong); + void (*SetFloatField)(JNIEnv *, jobject, jfieldID, jfloat); + void (*SetDoubleField)(JNIEnv *, jobject, jfieldID, jdouble); - jmethodID (*GetStaticMethodID)(JNIEnv*, jclass, const char*, const char*); + jmethodID (*GetStaticMethodID)(JNIEnv *, jclass, const char *, const char *); - jobject (*CallStaticObjectMethod)(JNIEnv*, jclass, jmethodID, ...); - jobject (*CallStaticObjectMethodV)(JNIEnv*, jclass, jmethodID, va_list); - jobject (*CallStaticObjectMethodA)(JNIEnv*, jclass, jmethodID, jvalue*); - jboolean (*CallStaticBooleanMethod)(JNIEnv*, jclass, jmethodID, ...); - jboolean (*CallStaticBooleanMethodV)(JNIEnv*, jclass, jmethodID, - va_list); - jboolean (*CallStaticBooleanMethodA)(JNIEnv*, jclass, jmethodID, - jvalue*); - jbyte (*CallStaticByteMethod)(JNIEnv*, jclass, jmethodID, ...); - jbyte (*CallStaticByteMethodV)(JNIEnv*, jclass, jmethodID, va_list); - jbyte (*CallStaticByteMethodA)(JNIEnv*, jclass, jmethodID, jvalue*); - jchar (*CallStaticCharMethod)(JNIEnv*, jclass, jmethodID, ...); - jchar (*CallStaticCharMethodV)(JNIEnv*, jclass, jmethodID, va_list); - jchar (*CallStaticCharMethodA)(JNIEnv*, jclass, jmethodID, jvalue*); - jshort (*CallStaticShortMethod)(JNIEnv*, jclass, jmethodID, ...); - jshort (*CallStaticShortMethodV)(JNIEnv*, jclass, jmethodID, va_list); - jshort (*CallStaticShortMethodA)(JNIEnv*, jclass, jmethodID, jvalue*); - jint (*CallStaticIntMethod)(JNIEnv*, jclass, jmethodID, ...); - jint (*CallStaticIntMethodV)(JNIEnv*, jclass, jmethodID, va_list); - jint (*CallStaticIntMethodA)(JNIEnv*, jclass, jmethodID, jvalue*); - jlong (*CallStaticLongMethod)(JNIEnv*, jclass, jmethodID, ...); - jlong (*CallStaticLongMethodV)(JNIEnv*, jclass, jmethodID, va_list); - jlong (*CallStaticLongMethodA)(JNIEnv*, jclass, jmethodID, jvalue*); - jfloat (*CallStaticFloatMethod)(JNIEnv*, jclass, jmethodID, ...); - jfloat (*CallStaticFloatMethodV)(JNIEnv*, jclass, jmethodID, va_list); - jfloat (*CallStaticFloatMethodA)(JNIEnv*, jclass, jmethodID, jvalue*); - jdouble (*CallStaticDoubleMethod)(JNIEnv*, jclass, jmethodID, ...); - jdouble (*CallStaticDoubleMethodV)(JNIEnv*, jclass, jmethodID, va_list); - jdouble (*CallStaticDoubleMethodA)(JNIEnv*, jclass, jmethodID, jvalue*); - void (*CallStaticVoidMethod)(JNIEnv*, jclass, jmethodID, ...); - void (*CallStaticVoidMethodV)(JNIEnv*, jclass, jmethodID, va_list); - void (*CallStaticVoidMethodA)(JNIEnv*, jclass, jmethodID, jvalue*); + jobject (*CallStaticObjectMethod)(JNIEnv *, jclass, jmethodID, ...); + jobject (*CallStaticObjectMethodV)(JNIEnv *, jclass, jmethodID, va_list); + jobject (*CallStaticObjectMethodA)(JNIEnv *, jclass, jmethodID, jvalue *); + jboolean (*CallStaticBooleanMethod)(JNIEnv *, jclass, jmethodID, ...); + jboolean (*CallStaticBooleanMethodV)(JNIEnv *, jclass, jmethodID, va_list); + jboolean (*CallStaticBooleanMethodA)(JNIEnv *, jclass, jmethodID, jvalue *); + jbyte (*CallStaticByteMethod)(JNIEnv *, jclass, jmethodID, ...); + jbyte (*CallStaticByteMethodV)(JNIEnv *, jclass, jmethodID, va_list); + jbyte (*CallStaticByteMethodA)(JNIEnv *, jclass, jmethodID, jvalue *); + jchar (*CallStaticCharMethod)(JNIEnv *, jclass, jmethodID, ...); + jchar (*CallStaticCharMethodV)(JNIEnv *, jclass, jmethodID, va_list); + jchar (*CallStaticCharMethodA)(JNIEnv *, jclass, jmethodID, jvalue *); + jshort (*CallStaticShortMethod)(JNIEnv *, jclass, jmethodID, ...); + jshort (*CallStaticShortMethodV)(JNIEnv *, jclass, jmethodID, va_list); + jshort (*CallStaticShortMethodA)(JNIEnv *, jclass, jmethodID, jvalue *); + jint (*CallStaticIntMethod)(JNIEnv *, jclass, jmethodID, ...); + jint (*CallStaticIntMethodV)(JNIEnv *, jclass, jmethodID, va_list); + jint (*CallStaticIntMethodA)(JNIEnv *, jclass, jmethodID, jvalue *); + jlong (*CallStaticLongMethod)(JNIEnv *, jclass, jmethodID, ...); + jlong (*CallStaticLongMethodV)(JNIEnv *, jclass, jmethodID, va_list); + jlong (*CallStaticLongMethodA)(JNIEnv *, jclass, jmethodID, jvalue *); + jfloat (*CallStaticFloatMethod)(JNIEnv *, jclass, jmethodID, ...); + jfloat (*CallStaticFloatMethodV)(JNIEnv *, jclass, jmethodID, va_list); + jfloat (*CallStaticFloatMethodA)(JNIEnv *, jclass, jmethodID, jvalue *); + jdouble (*CallStaticDoubleMethod)(JNIEnv *, jclass, jmethodID, ...); + jdouble (*CallStaticDoubleMethodV)(JNIEnv *, jclass, jmethodID, va_list); + jdouble (*CallStaticDoubleMethodA)(JNIEnv *, jclass, jmethodID, jvalue *); + void (*CallStaticVoidMethod)(JNIEnv *, jclass, jmethodID, ...); + void (*CallStaticVoidMethodV)(JNIEnv *, jclass, jmethodID, va_list); + void (*CallStaticVoidMethodA)(JNIEnv *, jclass, jmethodID, jvalue *); - jfieldID (*GetStaticFieldID)(JNIEnv*, jclass, const char*, - const char*); + jfieldID (*GetStaticFieldID)(JNIEnv *, jclass, const char *, const char *); - jobject (*GetStaticObjectField)(JNIEnv*, jclass, jfieldID); - jboolean (*GetStaticBooleanField)(JNIEnv*, jclass, jfieldID); - jbyte (*GetStaticByteField)(JNIEnv*, jclass, jfieldID); - jchar (*GetStaticCharField)(JNIEnv*, jclass, jfieldID); - jshort (*GetStaticShortField)(JNIEnv*, jclass, jfieldID); - jint (*GetStaticIntField)(JNIEnv*, jclass, jfieldID); - jlong (*GetStaticLongField)(JNIEnv*, jclass, jfieldID); - jfloat (*GetStaticFloatField)(JNIEnv*, jclass, jfieldID); - jdouble (*GetStaticDoubleField)(JNIEnv*, jclass, jfieldID); + jobject (*GetStaticObjectField)(JNIEnv *, jclass, jfieldID); + jboolean (*GetStaticBooleanField)(JNIEnv *, jclass, jfieldID); + jbyte (*GetStaticByteField)(JNIEnv *, jclass, jfieldID); + jchar (*GetStaticCharField)(JNIEnv *, jclass, jfieldID); + jshort (*GetStaticShortField)(JNIEnv *, jclass, jfieldID); + jint (*GetStaticIntField)(JNIEnv *, jclass, jfieldID); + jlong (*GetStaticLongField)(JNIEnv *, jclass, jfieldID); + jfloat (*GetStaticFloatField)(JNIEnv *, jclass, jfieldID); + jdouble (*GetStaticDoubleField)(JNIEnv *, jclass, jfieldID); - void (*SetStaticObjectField)(JNIEnv*, jclass, jfieldID, jobject); - void (*SetStaticBooleanField)(JNIEnv*, jclass, jfieldID, jboolean); - void (*SetStaticByteField)(JNIEnv*, jclass, jfieldID, jbyte); - void (*SetStaticCharField)(JNIEnv*, jclass, jfieldID, jchar); - void (*SetStaticShortField)(JNIEnv*, jclass, jfieldID, jshort); - void (*SetStaticIntField)(JNIEnv*, jclass, jfieldID, jint); - void (*SetStaticLongField)(JNIEnv*, jclass, jfieldID, jlong); - void (*SetStaticFloatField)(JNIEnv*, jclass, jfieldID, jfloat); - void (*SetStaticDoubleField)(JNIEnv*, jclass, jfieldID, jdouble); + void (*SetStaticObjectField)(JNIEnv *, jclass, jfieldID, jobject); + void (*SetStaticBooleanField)(JNIEnv *, jclass, jfieldID, jboolean); + void (*SetStaticByteField)(JNIEnv *, jclass, jfieldID, jbyte); + void (*SetStaticCharField)(JNIEnv *, jclass, jfieldID, jchar); + void (*SetStaticShortField)(JNIEnv *, jclass, jfieldID, jshort); + void (*SetStaticIntField)(JNIEnv *, jclass, jfieldID, jint); + void (*SetStaticLongField)(JNIEnv *, jclass, jfieldID, jlong); + void (*SetStaticFloatField)(JNIEnv *, jclass, jfieldID, jfloat); + void (*SetStaticDoubleField)(JNIEnv *, jclass, jfieldID, jdouble); - jstring (*NewString)(JNIEnv*, const jchar*, jsize); - jsize (*GetStringLength)(JNIEnv*, jstring); - const jchar* (*GetStringChars)(JNIEnv*, jstring, jboolean*); - void (*ReleaseStringChars)(JNIEnv*, jstring, const jchar*); - jstring (*NewStringUTF)(JNIEnv*, const char*); - jsize (*GetStringUTFLength)(JNIEnv*, jstring); - /* JNI spec says this returns const jbyte*, but that's inconsistent */ - const char* (*GetStringUTFChars)(JNIEnv*, jstring, jboolean*); - void (*ReleaseStringUTFChars)(JNIEnv*, jstring, const char*); - jsize (*GetArrayLength)(JNIEnv*, jarray); - jobjectArray (*NewObjectArray)(JNIEnv*, jsize, jclass, jobject); - jobject (*GetObjectArrayElement)(JNIEnv*, jobjectArray, jsize); - void (*SetObjectArrayElement)(JNIEnv*, jobjectArray, jsize, jobject); + jstring (*NewString)(JNIEnv *, const jchar *, jsize); + jsize (*GetStringLength)(JNIEnv *, jstring); + const jchar *(*GetStringChars)(JNIEnv *, jstring, jboolean *); + void (*ReleaseStringChars)(JNIEnv *, jstring, const jchar *); + jstring (*NewStringUTF)(JNIEnv *, const char *); + jsize (*GetStringUTFLength)(JNIEnv *, jstring); + /* JNI spec says this returns const jbyte*, but that's inconsistent */ + const char *(*GetStringUTFChars)(JNIEnv *, jstring, jboolean *); + void (*ReleaseStringUTFChars)(JNIEnv *, jstring, const char *); + jsize (*GetArrayLength)(JNIEnv *, jarray); + jobjectArray (*NewObjectArray)(JNIEnv *, jsize, jclass, jobject); + jobject (*GetObjectArrayElement)(JNIEnv *, jobjectArray, jsize); + void (*SetObjectArrayElement)(JNIEnv *, jobjectArray, jsize, jobject); - jbooleanArray (*NewBooleanArray)(JNIEnv*, jsize); - jbyteArray (*NewByteArray)(JNIEnv*, jsize); - jcharArray (*NewCharArray)(JNIEnv*, jsize); - jshortArray (*NewShortArray)(JNIEnv*, jsize); - jintArray (*NewIntArray)(JNIEnv*, jsize); - jlongArray (*NewLongArray)(JNIEnv*, jsize); - jfloatArray (*NewFloatArray)(JNIEnv*, jsize); - jdoubleArray (*NewDoubleArray)(JNIEnv*, jsize); + jbooleanArray (*NewBooleanArray)(JNIEnv *, jsize); + jbyteArray (*NewByteArray)(JNIEnv *, jsize); + jcharArray (*NewCharArray)(JNIEnv *, jsize); + jshortArray (*NewShortArray)(JNIEnv *, jsize); + jintArray (*NewIntArray)(JNIEnv *, jsize); + jlongArray (*NewLongArray)(JNIEnv *, jsize); + jfloatArray (*NewFloatArray)(JNIEnv *, jsize); + jdoubleArray (*NewDoubleArray)(JNIEnv *, jsize); - jboolean* (*GetBooleanArrayElements)(JNIEnv*, jbooleanArray, jboolean*); - jbyte* (*GetByteArrayElements)(JNIEnv*, jbyteArray, jboolean*); - jchar* (*GetCharArrayElements)(JNIEnv*, jcharArray, jboolean*); - jshort* (*GetShortArrayElements)(JNIEnv*, jshortArray, jboolean*); - jint* (*GetIntArrayElements)(JNIEnv*, jintArray, jboolean*); - jlong* (*GetLongArrayElements)(JNIEnv*, jlongArray, jboolean*); - jfloat* (*GetFloatArrayElements)(JNIEnv*, jfloatArray, jboolean*); - jdouble* (*GetDoubleArrayElements)(JNIEnv*, jdoubleArray, jboolean*); + jboolean *(*GetBooleanArrayElements)(JNIEnv *, jbooleanArray, jboolean *); + jbyte *(*GetByteArrayElements)(JNIEnv *, jbyteArray, jboolean *); + jchar *(*GetCharArrayElements)(JNIEnv *, jcharArray, jboolean *); + jshort *(*GetShortArrayElements)(JNIEnv *, jshortArray, jboolean *); + jint *(*GetIntArrayElements)(JNIEnv *, jintArray, jboolean *); + jlong *(*GetLongArrayElements)(JNIEnv *, jlongArray, jboolean *); + jfloat *(*GetFloatArrayElements)(JNIEnv *, jfloatArray, jboolean *); + jdouble *(*GetDoubleArrayElements)(JNIEnv *, jdoubleArray, jboolean *); - void (*ReleaseBooleanArrayElements)(JNIEnv*, jbooleanArray, - jboolean*, jint); - void (*ReleaseByteArrayElements)(JNIEnv*, jbyteArray, - jbyte*, jint); - void (*ReleaseCharArrayElements)(JNIEnv*, jcharArray, - jchar*, jint); - void (*ReleaseShortArrayElements)(JNIEnv*, jshortArray, - jshort*, jint); - void (*ReleaseIntArrayElements)(JNIEnv*, jintArray, - jint*, jint); - void (*ReleaseLongArrayElements)(JNIEnv*, jlongArray, - jlong*, jint); - void (*ReleaseFloatArrayElements)(JNIEnv*, jfloatArray, - jfloat*, jint); - void (*ReleaseDoubleArrayElements)(JNIEnv*, jdoubleArray, - jdouble*, jint); + void ( + *ReleaseBooleanArrayElements)(JNIEnv *, jbooleanArray, jboolean *, jint); + void (*ReleaseByteArrayElements)(JNIEnv *, jbyteArray, jbyte *, jint); + void (*ReleaseCharArrayElements)(JNIEnv *, jcharArray, jchar *, jint); + void (*ReleaseShortArrayElements)(JNIEnv *, jshortArray, jshort *, jint); + void (*ReleaseIntArrayElements)(JNIEnv *, jintArray, jint *, jint); + void (*ReleaseLongArrayElements)(JNIEnv *, jlongArray, jlong *, jint); + void (*ReleaseFloatArrayElements)(JNIEnv *, jfloatArray, jfloat *, jint); + void (*ReleaseDoubleArrayElements)(JNIEnv *, jdoubleArray, jdouble *, jint); - void (*GetBooleanArrayRegion)(JNIEnv*, jbooleanArray, - jsize, jsize, jboolean*); - void (*GetByteArrayRegion)(JNIEnv*, jbyteArray, - jsize, jsize, jbyte*); - void (*GetCharArrayRegion)(JNIEnv*, jcharArray, - jsize, jsize, jchar*); - void (*GetShortArrayRegion)(JNIEnv*, jshortArray, - jsize, jsize, jshort*); - void (*GetIntArrayRegion)(JNIEnv*, jintArray, - jsize, jsize, jint*); - void (*GetLongArrayRegion)(JNIEnv*, jlongArray, - jsize, jsize, jlong*); - void (*GetFloatArrayRegion)(JNIEnv*, jfloatArray, - jsize, jsize, jfloat*); - void (*GetDoubleArrayRegion)(JNIEnv*, jdoubleArray, - jsize, jsize, jdouble*); + void (*GetBooleanArrayRegion)( + JNIEnv *, + jbooleanArray, + jsize, + jsize, + jboolean *); + void (*GetByteArrayRegion)(JNIEnv *, jbyteArray, jsize, jsize, jbyte *); + void (*GetCharArrayRegion)(JNIEnv *, jcharArray, jsize, jsize, jchar *); + void (*GetShortArrayRegion)(JNIEnv *, jshortArray, jsize, jsize, jshort *); + void (*GetIntArrayRegion)(JNIEnv *, jintArray, jsize, jsize, jint *); + void (*GetLongArrayRegion)(JNIEnv *, jlongArray, jsize, jsize, jlong *); + void (*GetFloatArrayRegion)(JNIEnv *, jfloatArray, jsize, jsize, jfloat *); + void (*GetDoubleArrayRegion)(JNIEnv *, jdoubleArray, jsize, jsize, jdouble *); - /* spec shows these without const; some jni.h do, some don't */ - void (*SetBooleanArrayRegion)(JNIEnv*, jbooleanArray, - jsize, jsize, const jboolean*); - void (*SetByteArrayRegion)(JNIEnv*, jbyteArray, - jsize, jsize, const jbyte*); - void (*SetCharArrayRegion)(JNIEnv*, jcharArray, - jsize, jsize, const jchar*); - void (*SetShortArrayRegion)(JNIEnv*, jshortArray, - jsize, jsize, const jshort*); - void (*SetIntArrayRegion)(JNIEnv*, jintArray, - jsize, jsize, const jint*); - void (*SetLongArrayRegion)(JNIEnv*, jlongArray, - jsize, jsize, const jlong*); - void (*SetFloatArrayRegion)(JNIEnv*, jfloatArray, - jsize, jsize, const jfloat*); - void (*SetDoubleArrayRegion)(JNIEnv*, jdoubleArray, - jsize, jsize, const jdouble*); + /* spec shows these without const; some jni.h do, some don't */ + void (*SetBooleanArrayRegion)( + JNIEnv *, + jbooleanArray, + jsize, + jsize, + const jboolean *); + void (*SetByteArrayRegion)(JNIEnv *, jbyteArray, jsize, jsize, const jbyte *); + void (*SetCharArrayRegion)(JNIEnv *, jcharArray, jsize, jsize, const jchar *); + void (*SetShortArrayRegion)( + JNIEnv *, + jshortArray, + jsize, + jsize, + const jshort *); + void (*SetIntArrayRegion)(JNIEnv *, jintArray, jsize, jsize, const jint *); + void (*SetLongArrayRegion)(JNIEnv *, jlongArray, jsize, jsize, const jlong *); + void (*SetFloatArrayRegion)( + JNIEnv *, + jfloatArray, + jsize, + jsize, + const jfloat *); + void (*SetDoubleArrayRegion)( + JNIEnv *, + jdoubleArray, + jsize, + jsize, + const jdouble *); - jint (*RegisterNatives)(JNIEnv*, jclass, const JNINativeMethod*, - jint); - jint (*UnregisterNatives)(JNIEnv*, jclass); - jint (*MonitorEnter)(JNIEnv*, jobject); - jint (*MonitorExit)(JNIEnv*, jobject); - jint (*GetJavaVM)(JNIEnv*, JavaVM**); + jint (*RegisterNatives)(JNIEnv *, jclass, const JNINativeMethod *, jint); + jint (*UnregisterNatives)(JNIEnv *, jclass); + jint (*MonitorEnter)(JNIEnv *, jobject); + jint (*MonitorExit)(JNIEnv *, jobject); + jint (*GetJavaVM)(JNIEnv *, JavaVM **); - void (*GetStringRegion)(JNIEnv*, jstring, jsize, jsize, jchar*); - void (*GetStringUTFRegion)(JNIEnv*, jstring, jsize, jsize, char*); + void (*GetStringRegion)(JNIEnv *, jstring, jsize, jsize, jchar *); + void (*GetStringUTFRegion)(JNIEnv *, jstring, jsize, jsize, char *); - void* (*GetPrimitiveArrayCritical)(JNIEnv*, jarray, jboolean*); - void (*ReleasePrimitiveArrayCritical)(JNIEnv*, jarray, void*, jint); + void *(*GetPrimitiveArrayCritical)(JNIEnv *, jarray, jboolean *); + void (*ReleasePrimitiveArrayCritical)(JNIEnv *, jarray, void *, jint); - const jchar* (*GetStringCritical)(JNIEnv*, jstring, jboolean*); - void (*ReleaseStringCritical)(JNIEnv*, jstring, const jchar*); + const jchar *(*GetStringCritical)(JNIEnv *, jstring, jboolean *); + void (*ReleaseStringCritical)(JNIEnv *, jstring, const jchar *); - jweak (*NewWeakGlobalRef)(JNIEnv*, jobject); - void (*DeleteWeakGlobalRef)(JNIEnv*, jweak); + jweak (*NewWeakGlobalRef)(JNIEnv *, jobject); + void (*DeleteWeakGlobalRef)(JNIEnv *, jweak); - jboolean (*ExceptionCheck)(JNIEnv*); + jboolean (*ExceptionCheck)(JNIEnv *); - jobject (*NewDirectByteBuffer)(JNIEnv*, void*, jlong); - void* (*GetDirectBufferAddress)(JNIEnv*, jobject); - jlong (*GetDirectBufferCapacity)(JNIEnv*, jobject); + jobject (*NewDirectByteBuffer)(JNIEnv *, void *, jlong); + void *(*GetDirectBufferAddress)(JNIEnv *, jobject); + jlong (*GetDirectBufferCapacity)(JNIEnv *, jobject); - /* added in JNI 1.6 */ - jobjectRefType (*GetObjectRefType)(JNIEnv*, jobject); + /* added in JNI 1.6 */ + jobjectRefType (*GetObjectRefType)(JNIEnv *, jobject); }; /* @@ -489,588 +556,762 @@ struct JNINativeInterface { * JNINativeInterface*. We rely somewhat on compiler behavior. */ struct _JNIEnv { - /* do not rename this; it does not seem to be entirely opaque */ - const struct JNINativeInterface* functions; + /* do not rename this; it does not seem to be entirely opaque */ + const struct JNINativeInterface *functions; #if defined(__cplusplus) - jint GetVersion() - { return functions->GetVersion(this); } - - jclass DefineClass(const char *name, jobject loader, const jbyte* buf, - jsize bufLen) - { return functions->DefineClass(this, name, loader, buf, bufLen); } - - jclass FindClass(const char* name) - { return functions->FindClass(this, name); } - - jmethodID FromReflectedMethod(jobject method) - { return functions->FromReflectedMethod(this, method); } - - jfieldID FromReflectedField(jobject field) - { return functions->FromReflectedField(this, field); } - - jobject ToReflectedMethod(jclass cls, jmethodID methodID, jboolean isStatic) - { return functions->ToReflectedMethod(this, cls, methodID, isStatic); } - - jclass GetSuperclass(jclass clazz) - { return functions->GetSuperclass(this, clazz); } - - jboolean IsAssignableFrom(jclass clazz1, jclass clazz2) - { return functions->IsAssignableFrom(this, clazz1, clazz2); } - - jobject ToReflectedField(jclass cls, jfieldID fieldID, jboolean isStatic) - { return functions->ToReflectedField(this, cls, fieldID, isStatic); } - - jint Throw(jthrowable obj) - { return functions->Throw(this, obj); } - - jint ThrowNew(jclass clazz, const char* message) - { return functions->ThrowNew(this, clazz, message); } - - jthrowable ExceptionOccurred() - { return functions->ExceptionOccurred(this); } - - void ExceptionDescribe() - { functions->ExceptionDescribe(this); } - - void ExceptionClear() - { functions->ExceptionClear(this); } - - void FatalError(const char* msg) - { functions->FatalError(this, msg); } - - jint PushLocalFrame(jint capacity) - { return functions->PushLocalFrame(this, capacity); } - - jobject PopLocalFrame(jobject result) - { return functions->PopLocalFrame(this, result); } - - jobject NewGlobalRef(jobject obj) - { return functions->NewGlobalRef(this, obj); } - - void DeleteGlobalRef(jobject globalRef) - { functions->DeleteGlobalRef(this, globalRef); } - - void DeleteLocalRef(jobject localRef) - { functions->DeleteLocalRef(this, localRef); } - - jboolean IsSameObject(jobject ref1, jobject ref2) - { return functions->IsSameObject(this, ref1, ref2); } - - jobject NewLocalRef(jobject ref) - { return functions->NewLocalRef(this, ref); } - - jint EnsureLocalCapacity(jint capacity) - { return functions->EnsureLocalCapacity(this, capacity); } - - jobject AllocObject(jclass clazz) - { return functions->AllocObject(this, clazz); } - - jobject NewObject(jclass clazz, jmethodID methodID, ...) - { - va_list args; - va_start(args, methodID); - jobject result = functions->NewObjectV(this, clazz, methodID, args); - va_end(args); - return result; - } - - jobject NewObjectV(jclass clazz, jmethodID methodID, va_list args) - { return functions->NewObjectV(this, clazz, methodID, args); } - - jobject NewObjectA(jclass clazz, jmethodID methodID, jvalue* args) - { return functions->NewObjectA(this, clazz, methodID, args); } - - jclass GetObjectClass(jobject obj) - { return functions->GetObjectClass(this, obj); } - - jboolean IsInstanceOf(jobject obj, jclass clazz) - { return functions->IsInstanceOf(this, obj, clazz); } - - jmethodID GetMethodID(jclass clazz, const char* name, const char* sig) - { return functions->GetMethodID(this, clazz, name, sig); } - -#define CALL_TYPE_METHOD(_jtype, _jname) \ - _jtype Call##_jname##Method(jobject obj, jmethodID methodID, ...) \ - { \ - _jtype result; \ - va_list args; \ - va_start(args, methodID); \ - result = functions->Call##_jname##MethodV(this, obj, methodID, \ - args); \ - va_end(args); \ - return result; \ - } -#define CALL_TYPE_METHODV(_jtype, _jname) \ - _jtype Call##_jname##MethodV(jobject obj, jmethodID methodID, \ - va_list args) \ - { return functions->Call##_jname##MethodV(this, obj, methodID, args); } -#define CALL_TYPE_METHODA(_jtype, _jname) \ - _jtype Call##_jname##MethodA(jobject obj, jmethodID methodID, \ - jvalue* args) \ - { return functions->Call##_jname##MethodA(this, obj, methodID, args); } - -#define CALL_TYPE(_jtype, _jname) \ - CALL_TYPE_METHOD(_jtype, _jname) \ - CALL_TYPE_METHODV(_jtype, _jname) \ - CALL_TYPE_METHODA(_jtype, _jname) - - CALL_TYPE(jobject, Object) - CALL_TYPE(jboolean, Boolean) - CALL_TYPE(jbyte, Byte) - CALL_TYPE(jchar, Char) - CALL_TYPE(jshort, Short) - CALL_TYPE(jint, Int) - CALL_TYPE(jlong, Long) - CALL_TYPE(jfloat, Float) - CALL_TYPE(jdouble, Double) - - void CallVoidMethod(jobject obj, jmethodID methodID, ...) - { - va_list args; - va_start(args, methodID); - functions->CallVoidMethodV(this, obj, methodID, args); - va_end(args); - } - void CallVoidMethodV(jobject obj, jmethodID methodID, va_list args) - { functions->CallVoidMethodV(this, obj, methodID, args); } - void CallVoidMethodA(jobject obj, jmethodID methodID, jvalue* args) - { functions->CallVoidMethodA(this, obj, methodID, args); } - -#define CALL_NONVIRT_TYPE_METHOD(_jtype, _jname) \ - _jtype CallNonvirtual##_jname##Method(jobject obj, jclass clazz, \ - jmethodID methodID, ...) \ - { \ - _jtype result; \ - va_list args; \ - va_start(args, methodID); \ - result = functions->CallNonvirtual##_jname##MethodV(this, obj, \ - clazz, methodID, args); \ - va_end(args); \ - return result; \ - } -#define CALL_NONVIRT_TYPE_METHODV(_jtype, _jname) \ - _jtype CallNonvirtual##_jname##MethodV(jobject obj, jclass clazz, \ - jmethodID methodID, va_list args) \ - { return functions->CallNonvirtual##_jname##MethodV(this, obj, clazz, \ - methodID, args); } -#define CALL_NONVIRT_TYPE_METHODA(_jtype, _jname) \ - _jtype CallNonvirtual##_jname##MethodA(jobject obj, jclass clazz, \ - jmethodID methodID, jvalue* args) \ - { return functions->CallNonvirtual##_jname##MethodA(this, obj, clazz, \ - methodID, args); } - -#define CALL_NONVIRT_TYPE(_jtype, _jname) \ - CALL_NONVIRT_TYPE_METHOD(_jtype, _jname) \ - CALL_NONVIRT_TYPE_METHODV(_jtype, _jname) \ - CALL_NONVIRT_TYPE_METHODA(_jtype, _jname) - - CALL_NONVIRT_TYPE(jobject, Object) - CALL_NONVIRT_TYPE(jboolean, Boolean) - CALL_NONVIRT_TYPE(jbyte, Byte) - CALL_NONVIRT_TYPE(jchar, Char) - CALL_NONVIRT_TYPE(jshort, Short) - CALL_NONVIRT_TYPE(jint, Int) - CALL_NONVIRT_TYPE(jlong, Long) - CALL_NONVIRT_TYPE(jfloat, Float) - CALL_NONVIRT_TYPE(jdouble, Double) - - void CallNonvirtualVoidMethod(jobject obj, jclass clazz, - jmethodID methodID, ...) - { - va_list args; - va_start(args, methodID); - functions->CallNonvirtualVoidMethodV(this, obj, clazz, methodID, args); - va_end(args); - } - void CallNonvirtualVoidMethodV(jobject obj, jclass clazz, - jmethodID methodID, va_list args) - { functions->CallNonvirtualVoidMethodV(this, obj, clazz, methodID, args); } - void CallNonvirtualVoidMethodA(jobject obj, jclass clazz, - jmethodID methodID, jvalue* args) - { functions->CallNonvirtualVoidMethodA(this, obj, clazz, methodID, args); } - - jfieldID GetFieldID(jclass clazz, const char* name, const char* sig) - { return functions->GetFieldID(this, clazz, name, sig); } - - jobject GetObjectField(jobject obj, jfieldID fieldID) - { return functions->GetObjectField(this, obj, fieldID); } - jboolean GetBooleanField(jobject obj, jfieldID fieldID) - { return functions->GetBooleanField(this, obj, fieldID); } - jbyte GetByteField(jobject obj, jfieldID fieldID) - { return functions->GetByteField(this, obj, fieldID); } - jchar GetCharField(jobject obj, jfieldID fieldID) - { return functions->GetCharField(this, obj, fieldID); } - jshort GetShortField(jobject obj, jfieldID fieldID) - { return functions->GetShortField(this, obj, fieldID); } - jint GetIntField(jobject obj, jfieldID fieldID) - { return functions->GetIntField(this, obj, fieldID); } - jlong GetLongField(jobject obj, jfieldID fieldID) - { return functions->GetLongField(this, obj, fieldID); } - jfloat GetFloatField(jobject obj, jfieldID fieldID) - { return functions->GetFloatField(this, obj, fieldID); } - jdouble GetDoubleField(jobject obj, jfieldID fieldID) - { return functions->GetDoubleField(this, obj, fieldID); } - - void SetObjectField(jobject obj, jfieldID fieldID, jobject value) - { functions->SetObjectField(this, obj, fieldID, value); } - void SetBooleanField(jobject obj, jfieldID fieldID, jboolean value) - { functions->SetBooleanField(this, obj, fieldID, value); } - void SetByteField(jobject obj, jfieldID fieldID, jbyte value) - { functions->SetByteField(this, obj, fieldID, value); } - void SetCharField(jobject obj, jfieldID fieldID, jchar value) - { functions->SetCharField(this, obj, fieldID, value); } - void SetShortField(jobject obj, jfieldID fieldID, jshort value) - { functions->SetShortField(this, obj, fieldID, value); } - void SetIntField(jobject obj, jfieldID fieldID, jint value) - { functions->SetIntField(this, obj, fieldID, value); } - void SetLongField(jobject obj, jfieldID fieldID, jlong value) - { functions->SetLongField(this, obj, fieldID, value); } - void SetFloatField(jobject obj, jfieldID fieldID, jfloat value) - { functions->SetFloatField(this, obj, fieldID, value); } - void SetDoubleField(jobject obj, jfieldID fieldID, jdouble value) - { functions->SetDoubleField(this, obj, fieldID, value); } - - jmethodID GetStaticMethodID(jclass clazz, const char* name, const char* sig) - { return functions->GetStaticMethodID(this, clazz, name, sig); } - -#define CALL_STATIC_TYPE_METHOD(_jtype, _jname) \ - _jtype CallStatic##_jname##Method(jclass clazz, jmethodID methodID, \ - ...) \ - { \ - _jtype result; \ - va_list args; \ - va_start(args, methodID); \ - result = functions->CallStatic##_jname##MethodV(this, clazz, \ - methodID, args); \ - va_end(args); \ - return result; \ - } -#define CALL_STATIC_TYPE_METHODV(_jtype, _jname) \ - _jtype CallStatic##_jname##MethodV(jclass clazz, jmethodID methodID, \ - va_list args) \ - { return functions->CallStatic##_jname##MethodV(this, clazz, methodID, \ - args); } -#define CALL_STATIC_TYPE_METHODA(_jtype, _jname) \ - _jtype CallStatic##_jname##MethodA(jclass clazz, jmethodID methodID, \ - jvalue* args) \ - { return functions->CallStatic##_jname##MethodA(this, clazz, methodID, \ - args); } - -#define CALL_STATIC_TYPE(_jtype, _jname) \ - CALL_STATIC_TYPE_METHOD(_jtype, _jname) \ - CALL_STATIC_TYPE_METHODV(_jtype, _jname) \ - CALL_STATIC_TYPE_METHODA(_jtype, _jname) - - CALL_STATIC_TYPE(jobject, Object) - CALL_STATIC_TYPE(jboolean, Boolean) - CALL_STATIC_TYPE(jbyte, Byte) - CALL_STATIC_TYPE(jchar, Char) - CALL_STATIC_TYPE(jshort, Short) - CALL_STATIC_TYPE(jint, Int) - CALL_STATIC_TYPE(jlong, Long) - CALL_STATIC_TYPE(jfloat, Float) - CALL_STATIC_TYPE(jdouble, Double) - - void CallStaticVoidMethod(jclass clazz, jmethodID methodID, ...) - { - va_list args; - va_start(args, methodID); - functions->CallStaticVoidMethodV(this, clazz, methodID, args); - va_end(args); - } - void CallStaticVoidMethodV(jclass clazz, jmethodID methodID, va_list args) - { functions->CallStaticVoidMethodV(this, clazz, methodID, args); } - void CallStaticVoidMethodA(jclass clazz, jmethodID methodID, jvalue* args) - { functions->CallStaticVoidMethodA(this, clazz, methodID, args); } - - jfieldID GetStaticFieldID(jclass clazz, const char* name, const char* sig) - { return functions->GetStaticFieldID(this, clazz, name, sig); } - - jobject GetStaticObjectField(jclass clazz, jfieldID fieldID) - { return functions->GetStaticObjectField(this, clazz, fieldID); } - jboolean GetStaticBooleanField(jclass clazz, jfieldID fieldID) - { return functions->GetStaticBooleanField(this, clazz, fieldID); } - jbyte GetStaticByteField(jclass clazz, jfieldID fieldID) - { return functions->GetStaticByteField(this, clazz, fieldID); } - jchar GetStaticCharField(jclass clazz, jfieldID fieldID) - { return functions->GetStaticCharField(this, clazz, fieldID); } - jshort GetStaticShortField(jclass clazz, jfieldID fieldID) - { return functions->GetStaticShortField(this, clazz, fieldID); } - jint GetStaticIntField(jclass clazz, jfieldID fieldID) - { return functions->GetStaticIntField(this, clazz, fieldID); } - jlong GetStaticLongField(jclass clazz, jfieldID fieldID) - { return functions->GetStaticLongField(this, clazz, fieldID); } - jfloat GetStaticFloatField(jclass clazz, jfieldID fieldID) - { return functions->GetStaticFloatField(this, clazz, fieldID); } - jdouble GetStaticDoubleField(jclass clazz, jfieldID fieldID) - { return functions->GetStaticDoubleField(this, clazz, fieldID); } - - void SetStaticObjectField(jclass clazz, jfieldID fieldID, jobject value) - { functions->SetStaticObjectField(this, clazz, fieldID, value); } - void SetStaticBooleanField(jclass clazz, jfieldID fieldID, jboolean value) - { functions->SetStaticBooleanField(this, clazz, fieldID, value); } - void SetStaticByteField(jclass clazz, jfieldID fieldID, jbyte value) - { functions->SetStaticByteField(this, clazz, fieldID, value); } - void SetStaticCharField(jclass clazz, jfieldID fieldID, jchar value) - { functions->SetStaticCharField(this, clazz, fieldID, value); } - void SetStaticShortField(jclass clazz, jfieldID fieldID, jshort value) - { functions->SetStaticShortField(this, clazz, fieldID, value); } - void SetStaticIntField(jclass clazz, jfieldID fieldID, jint value) - { functions->SetStaticIntField(this, clazz, fieldID, value); } - void SetStaticLongField(jclass clazz, jfieldID fieldID, jlong value) - { functions->SetStaticLongField(this, clazz, fieldID, value); } - void SetStaticFloatField(jclass clazz, jfieldID fieldID, jfloat value) - { functions->SetStaticFloatField(this, clazz, fieldID, value); } - void SetStaticDoubleField(jclass clazz, jfieldID fieldID, jdouble value) - { functions->SetStaticDoubleField(this, clazz, fieldID, value); } - - jstring NewString(const jchar* unicodeChars, jsize len) - { return functions->NewString(this, unicodeChars, len); } - - jsize GetStringLength(jstring string) - { return functions->GetStringLength(this, string); } - - const jchar* GetStringChars(jstring string, jboolean* isCopy) - { return functions->GetStringChars(this, string, isCopy); } - - void ReleaseStringChars(jstring string, const jchar* chars) - { functions->ReleaseStringChars(this, string, chars); } - - jstring NewStringUTF(const char* bytes) - { return functions->NewStringUTF(this, bytes); } - - jsize GetStringUTFLength(jstring string) - { return functions->GetStringUTFLength(this, string); } - - const char* GetStringUTFChars(jstring string, jboolean* isCopy) - { return functions->GetStringUTFChars(this, string, isCopy); } - - void ReleaseStringUTFChars(jstring string, const char* utf) - { functions->ReleaseStringUTFChars(this, string, utf); } - - jsize GetArrayLength(jarray array) - { return functions->GetArrayLength(this, array); } - - jobjectArray NewObjectArray(jsize length, jclass elementClass, - jobject initialElement) - { return functions->NewObjectArray(this, length, elementClass, - initialElement); } - - jobject GetObjectArrayElement(jobjectArray array, jsize index) - { return functions->GetObjectArrayElement(this, array, index); } - - void SetObjectArrayElement(jobjectArray array, jsize index, jobject value) - { functions->SetObjectArrayElement(this, array, index, value); } - - jbooleanArray NewBooleanArray(jsize length) - { return functions->NewBooleanArray(this, length); } - jbyteArray NewByteArray(jsize length) - { return functions->NewByteArray(this, length); } - jcharArray NewCharArray(jsize length) - { return functions->NewCharArray(this, length); } - jshortArray NewShortArray(jsize length) - { return functions->NewShortArray(this, length); } - jintArray NewIntArray(jsize length) - { return functions->NewIntArray(this, length); } - jlongArray NewLongArray(jsize length) - { return functions->NewLongArray(this, length); } - jfloatArray NewFloatArray(jsize length) - { return functions->NewFloatArray(this, length); } - jdoubleArray NewDoubleArray(jsize length) - { return functions->NewDoubleArray(this, length); } - - jboolean* GetBooleanArrayElements(jbooleanArray array, jboolean* isCopy) - { return functions->GetBooleanArrayElements(this, array, isCopy); } - jbyte* GetByteArrayElements(jbyteArray array, jboolean* isCopy) - { return functions->GetByteArrayElements(this, array, isCopy); } - jchar* GetCharArrayElements(jcharArray array, jboolean* isCopy) - { return functions->GetCharArrayElements(this, array, isCopy); } - jshort* GetShortArrayElements(jshortArray array, jboolean* isCopy) - { return functions->GetShortArrayElements(this, array, isCopy); } - jint* GetIntArrayElements(jintArray array, jboolean* isCopy) - { return functions->GetIntArrayElements(this, array, isCopy); } - jlong* GetLongArrayElements(jlongArray array, jboolean* isCopy) - { return functions->GetLongArrayElements(this, array, isCopy); } - jfloat* GetFloatArrayElements(jfloatArray array, jboolean* isCopy) - { return functions->GetFloatArrayElements(this, array, isCopy); } - jdouble* GetDoubleArrayElements(jdoubleArray array, jboolean* isCopy) - { return functions->GetDoubleArrayElements(this, array, isCopy); } - - void ReleaseBooleanArrayElements(jbooleanArray array, jboolean* elems, - jint mode) - { functions->ReleaseBooleanArrayElements(this, array, elems, mode); } - void ReleaseByteArrayElements(jbyteArray array, jbyte* elems, - jint mode) - { functions->ReleaseByteArrayElements(this, array, elems, mode); } - void ReleaseCharArrayElements(jcharArray array, jchar* elems, - jint mode) - { functions->ReleaseCharArrayElements(this, array, elems, mode); } - void ReleaseShortArrayElements(jshortArray array, jshort* elems, - jint mode) - { functions->ReleaseShortArrayElements(this, array, elems, mode); } - void ReleaseIntArrayElements(jintArray array, jint* elems, - jint mode) - { functions->ReleaseIntArrayElements(this, array, elems, mode); } - void ReleaseLongArrayElements(jlongArray array, jlong* elems, - jint mode) - { functions->ReleaseLongArrayElements(this, array, elems, mode); } - void ReleaseFloatArrayElements(jfloatArray array, jfloat* elems, - jint mode) - { functions->ReleaseFloatArrayElements(this, array, elems, mode); } - void ReleaseDoubleArrayElements(jdoubleArray array, jdouble* elems, - jint mode) - { functions->ReleaseDoubleArrayElements(this, array, elems, mode); } - - void GetBooleanArrayRegion(jbooleanArray array, jsize start, jsize len, - jboolean* buf) - { functions->GetBooleanArrayRegion(this, array, start, len, buf); } - void GetByteArrayRegion(jbyteArray array, jsize start, jsize len, - jbyte* buf) - { functions->GetByteArrayRegion(this, array, start, len, buf); } - void GetCharArrayRegion(jcharArray array, jsize start, jsize len, - jchar* buf) - { functions->GetCharArrayRegion(this, array, start, len, buf); } - void GetShortArrayRegion(jshortArray array, jsize start, jsize len, - jshort* buf) - { functions->GetShortArrayRegion(this, array, start, len, buf); } - void GetIntArrayRegion(jintArray array, jsize start, jsize len, - jint* buf) - { functions->GetIntArrayRegion(this, array, start, len, buf); } - void GetLongArrayRegion(jlongArray array, jsize start, jsize len, - jlong* buf) - { functions->GetLongArrayRegion(this, array, start, len, buf); } - void GetFloatArrayRegion(jfloatArray array, jsize start, jsize len, - jfloat* buf) - { functions->GetFloatArrayRegion(this, array, start, len, buf); } - void GetDoubleArrayRegion(jdoubleArray array, jsize start, jsize len, - jdouble* buf) - { functions->GetDoubleArrayRegion(this, array, start, len, buf); } - - void SetBooleanArrayRegion(jbooleanArray array, jsize start, jsize len, - const jboolean* buf) - { functions->SetBooleanArrayRegion(this, array, start, len, buf); } - void SetByteArrayRegion(jbyteArray array, jsize start, jsize len, - const jbyte* buf) - { functions->SetByteArrayRegion(this, array, start, len, buf); } - void SetCharArrayRegion(jcharArray array, jsize start, jsize len, - const jchar* buf) - { functions->SetCharArrayRegion(this, array, start, len, buf); } - void SetShortArrayRegion(jshortArray array, jsize start, jsize len, - const jshort* buf) - { functions->SetShortArrayRegion(this, array, start, len, buf); } - void SetIntArrayRegion(jintArray array, jsize start, jsize len, - const jint* buf) - { functions->SetIntArrayRegion(this, array, start, len, buf); } - void SetLongArrayRegion(jlongArray array, jsize start, jsize len, - const jlong* buf) - { functions->SetLongArrayRegion(this, array, start, len, buf); } - void SetFloatArrayRegion(jfloatArray array, jsize start, jsize len, - const jfloat* buf) - { functions->SetFloatArrayRegion(this, array, start, len, buf); } - void SetDoubleArrayRegion(jdoubleArray array, jsize start, jsize len, - const jdouble* buf) - { functions->SetDoubleArrayRegion(this, array, start, len, buf); } - - jint RegisterNatives(jclass clazz, const JNINativeMethod* methods, - jint nMethods) - { return functions->RegisterNatives(this, clazz, methods, nMethods); } - - jint UnregisterNatives(jclass clazz) - { return functions->UnregisterNatives(this, clazz); } - - jint MonitorEnter(jobject obj) - { return functions->MonitorEnter(this, obj); } - - jint MonitorExit(jobject obj) - { return functions->MonitorExit(this, obj); } - - jint GetJavaVM(JavaVM** vm) - { return functions->GetJavaVM(this, vm); } - - void GetStringRegion(jstring str, jsize start, jsize len, jchar* buf) - { functions->GetStringRegion(this, str, start, len, buf); } - - void GetStringUTFRegion(jstring str, jsize start, jsize len, char* buf) - { return functions->GetStringUTFRegion(this, str, start, len, buf); } - - void* GetPrimitiveArrayCritical(jarray array, jboolean* isCopy) - { return functions->GetPrimitiveArrayCritical(this, array, isCopy); } - - void ReleasePrimitiveArrayCritical(jarray array, void* carray, jint mode) - { functions->ReleasePrimitiveArrayCritical(this, array, carray, mode); } - - const jchar* GetStringCritical(jstring string, jboolean* isCopy) - { return functions->GetStringCritical(this, string, isCopy); } - - void ReleaseStringCritical(jstring string, const jchar* carray) - { functions->ReleaseStringCritical(this, string, carray); } - - jweak NewWeakGlobalRef(jobject obj) - { return functions->NewWeakGlobalRef(this, obj); } - - void DeleteWeakGlobalRef(jweak obj) - { functions->DeleteWeakGlobalRef(this, obj); } - - jboolean ExceptionCheck() - { return functions->ExceptionCheck(this); } - - jobject NewDirectByteBuffer(void* address, jlong capacity) - { return functions->NewDirectByteBuffer(this, address, capacity); } - - void* GetDirectBufferAddress(jobject buf) - { return functions->GetDirectBufferAddress(this, buf); } - - jlong GetDirectBufferCapacity(jobject buf) - { return functions->GetDirectBufferCapacity(this, buf); } - - /* added in JNI 1.6 */ - jobjectRefType GetObjectRefType(jobject obj) - { return functions->GetObjectRefType(this, obj); } + jint GetVersion() { + return functions->GetVersion(this); + } + + jclass DefineClass( + const char *name, + jobject loader, + const jbyte *buf, + jsize bufLen) { + return functions->DefineClass(this, name, loader, buf, bufLen); + } + + jclass FindClass(const char *name) { + return functions->FindClass(this, name); + } + + jmethodID FromReflectedMethod(jobject method) { + return functions->FromReflectedMethod(this, method); + } + + jfieldID FromReflectedField(jobject field) { + return functions->FromReflectedField(this, field); + } + + jobject ToReflectedMethod(jclass cls, jmethodID methodID, jboolean isStatic) { + return functions->ToReflectedMethod(this, cls, methodID, isStatic); + } + + jclass GetSuperclass(jclass clazz) { + return functions->GetSuperclass(this, clazz); + } + + jboolean IsAssignableFrom(jclass clazz1, jclass clazz2) { + return functions->IsAssignableFrom(this, clazz1, clazz2); + } + + jobject ToReflectedField(jclass cls, jfieldID fieldID, jboolean isStatic) { + return functions->ToReflectedField(this, cls, fieldID, isStatic); + } + + jint Throw(jthrowable obj) { + return functions->Throw(this, obj); + } + + jint ThrowNew(jclass clazz, const char *message) { + return functions->ThrowNew(this, clazz, message); + } + + jthrowable ExceptionOccurred() { + return functions->ExceptionOccurred(this); + } + + void ExceptionDescribe() { + functions->ExceptionDescribe(this); + } + + void ExceptionClear() { + functions->ExceptionClear(this); + } + + void FatalError(const char *msg) { + functions->FatalError(this, msg); + } + + jint PushLocalFrame(jint capacity) { + return functions->PushLocalFrame(this, capacity); + } + + jobject PopLocalFrame(jobject result) { + return functions->PopLocalFrame(this, result); + } + + jobject NewGlobalRef(jobject obj) { + return functions->NewGlobalRef(this, obj); + } + + void DeleteGlobalRef(jobject globalRef) { + functions->DeleteGlobalRef(this, globalRef); + } + + void DeleteLocalRef(jobject localRef) { + functions->DeleteLocalRef(this, localRef); + } + + jboolean IsSameObject(jobject ref1, jobject ref2) { + return functions->IsSameObject(this, ref1, ref2); + } + + jobject NewLocalRef(jobject ref) { + return functions->NewLocalRef(this, ref); + } + + jint EnsureLocalCapacity(jint capacity) { + return functions->EnsureLocalCapacity(this, capacity); + } + + jobject AllocObject(jclass clazz) { + return functions->AllocObject(this, clazz); + } + + jobject NewObject(jclass clazz, jmethodID methodID, ...) { + va_list args; + va_start(args, methodID); + jobject result = functions->NewObjectV(this, clazz, methodID, args); + va_end(args); + return result; + } + + jobject NewObjectV(jclass clazz, jmethodID methodID, va_list args) { + return functions->NewObjectV(this, clazz, methodID, args); + } + + jobject NewObjectA(jclass clazz, jmethodID methodID, jvalue *args) { + return functions->NewObjectA(this, clazz, methodID, args); + } + + jclass GetObjectClass(jobject obj) { + return functions->GetObjectClass(this, obj); + } + + jboolean IsInstanceOf(jobject obj, jclass clazz) { + return functions->IsInstanceOf(this, obj, clazz); + } + + jmethodID GetMethodID(jclass clazz, const char *name, const char *sig) { + return functions->GetMethodID(this, clazz, name, sig); + } + +#define CALL_TYPE_METHOD(_jtype, _jname) \ + _jtype Call##_jname##Method(jobject obj, jmethodID methodID, ...) { \ + _jtype result; \ + va_list args; \ + va_start(args, methodID); \ + result = functions->Call##_jname##MethodV(this, obj, methodID, args); \ + va_end(args); \ + return result; \ + } +#define CALL_TYPE_METHODV(_jtype, _jname) \ + _jtype Call##_jname##MethodV( \ + jobject obj, jmethodID methodID, va_list args) { \ + return functions->Call##_jname##MethodV(this, obj, methodID, args); \ + } +#define CALL_TYPE_METHODA(_jtype, _jname) \ + _jtype Call##_jname##MethodA( \ + jobject obj, jmethodID methodID, jvalue *args) { \ + return functions->Call##_jname##MethodA(this, obj, methodID, args); \ + } + +#define CALL_TYPE(_jtype, _jname) \ + CALL_TYPE_METHOD(_jtype, _jname) \ + CALL_TYPE_METHODV(_jtype, _jname) \ + CALL_TYPE_METHODA(_jtype, _jname) + + CALL_TYPE(jobject, Object) + CALL_TYPE(jboolean, Boolean) + CALL_TYPE(jbyte, Byte) + CALL_TYPE(jchar, Char) + CALL_TYPE(jshort, Short) + CALL_TYPE(jint, Int) + CALL_TYPE(jlong, Long) + CALL_TYPE(jfloat, Float) + CALL_TYPE(jdouble, Double) + + void CallVoidMethod(jobject obj, jmethodID methodID, ...) { + va_list args; + va_start(args, methodID); + functions->CallVoidMethodV(this, obj, methodID, args); + va_end(args); + } + void CallVoidMethodV(jobject obj, jmethodID methodID, va_list args) { + functions->CallVoidMethodV(this, obj, methodID, args); + } + void CallVoidMethodA(jobject obj, jmethodID methodID, jvalue *args) { + functions->CallVoidMethodA(this, obj, methodID, args); + } + +#define CALL_NONVIRT_TYPE_METHOD(_jtype, _jname) \ + _jtype CallNonvirtual##_jname##Method( \ + jobject obj, jclass clazz, jmethodID methodID, ...) { \ + _jtype result; \ + va_list args; \ + va_start(args, methodID); \ + result = functions->CallNonvirtual##_jname##MethodV( \ + this, obj, clazz, methodID, args); \ + va_end(args); \ + return result; \ + } +#define CALL_NONVIRT_TYPE_METHODV(_jtype, _jname) \ + _jtype CallNonvirtual##_jname##MethodV( \ + jobject obj, jclass clazz, jmethodID methodID, va_list args) { \ + return functions->CallNonvirtual##_jname##MethodV( \ + this, obj, clazz, methodID, args); \ + } +#define CALL_NONVIRT_TYPE_METHODA(_jtype, _jname) \ + _jtype CallNonvirtual##_jname##MethodA( \ + jobject obj, jclass clazz, jmethodID methodID, jvalue *args) { \ + return functions->CallNonvirtual##_jname##MethodA( \ + this, obj, clazz, methodID, args); \ + } + +#define CALL_NONVIRT_TYPE(_jtype, _jname) \ + CALL_NONVIRT_TYPE_METHOD(_jtype, _jname) \ + CALL_NONVIRT_TYPE_METHODV(_jtype, _jname) \ + CALL_NONVIRT_TYPE_METHODA(_jtype, _jname) + + CALL_NONVIRT_TYPE(jobject, Object) + CALL_NONVIRT_TYPE(jboolean, Boolean) + CALL_NONVIRT_TYPE(jbyte, Byte) + CALL_NONVIRT_TYPE(jchar, Char) + CALL_NONVIRT_TYPE(jshort, Short) + CALL_NONVIRT_TYPE(jint, Int) + CALL_NONVIRT_TYPE(jlong, Long) + CALL_NONVIRT_TYPE(jfloat, Float) + CALL_NONVIRT_TYPE(jdouble, Double) + + void + CallNonvirtualVoidMethod(jobject obj, jclass clazz, jmethodID methodID, ...) { + va_list args; + va_start(args, methodID); + functions->CallNonvirtualVoidMethodV(this, obj, clazz, methodID, args); + va_end(args); + } + void CallNonvirtualVoidMethodV( + jobject obj, + jclass clazz, + jmethodID methodID, + va_list args) { + functions->CallNonvirtualVoidMethodV(this, obj, clazz, methodID, args); + } + void CallNonvirtualVoidMethodA( + jobject obj, + jclass clazz, + jmethodID methodID, + jvalue *args) { + functions->CallNonvirtualVoidMethodA(this, obj, clazz, methodID, args); + } + + jfieldID GetFieldID(jclass clazz, const char *name, const char *sig) { + return functions->GetFieldID(this, clazz, name, sig); + } + + jobject GetObjectField(jobject obj, jfieldID fieldID) { + return functions->GetObjectField(this, obj, fieldID); + } + jboolean GetBooleanField(jobject obj, jfieldID fieldID) { + return functions->GetBooleanField(this, obj, fieldID); + } + jbyte GetByteField(jobject obj, jfieldID fieldID) { + return functions->GetByteField(this, obj, fieldID); + } + jchar GetCharField(jobject obj, jfieldID fieldID) { + return functions->GetCharField(this, obj, fieldID); + } + jshort GetShortField(jobject obj, jfieldID fieldID) { + return functions->GetShortField(this, obj, fieldID); + } + jint GetIntField(jobject obj, jfieldID fieldID) { + return functions->GetIntField(this, obj, fieldID); + } + jlong GetLongField(jobject obj, jfieldID fieldID) { + return functions->GetLongField(this, obj, fieldID); + } + jfloat GetFloatField(jobject obj, jfieldID fieldID) { + return functions->GetFloatField(this, obj, fieldID); + } + jdouble GetDoubleField(jobject obj, jfieldID fieldID) { + return functions->GetDoubleField(this, obj, fieldID); + } + + void SetObjectField(jobject obj, jfieldID fieldID, jobject value) { + functions->SetObjectField(this, obj, fieldID, value); + } + void SetBooleanField(jobject obj, jfieldID fieldID, jboolean value) { + functions->SetBooleanField(this, obj, fieldID, value); + } + void SetByteField(jobject obj, jfieldID fieldID, jbyte value) { + functions->SetByteField(this, obj, fieldID, value); + } + void SetCharField(jobject obj, jfieldID fieldID, jchar value) { + functions->SetCharField(this, obj, fieldID, value); + } + void SetShortField(jobject obj, jfieldID fieldID, jshort value) { + functions->SetShortField(this, obj, fieldID, value); + } + void SetIntField(jobject obj, jfieldID fieldID, jint value) { + functions->SetIntField(this, obj, fieldID, value); + } + void SetLongField(jobject obj, jfieldID fieldID, jlong value) { + functions->SetLongField(this, obj, fieldID, value); + } + void SetFloatField(jobject obj, jfieldID fieldID, jfloat value) { + functions->SetFloatField(this, obj, fieldID, value); + } + void SetDoubleField(jobject obj, jfieldID fieldID, jdouble value) { + functions->SetDoubleField(this, obj, fieldID, value); + } + + jmethodID GetStaticMethodID(jclass clazz, const char *name, const char *sig) { + return functions->GetStaticMethodID(this, clazz, name, sig); + } + +#define CALL_STATIC_TYPE_METHOD(_jtype, _jname) \ + _jtype CallStatic##_jname##Method(jclass clazz, jmethodID methodID, ...) { \ + _jtype result; \ + va_list args; \ + va_start(args, methodID); \ + result = \ + functions->CallStatic##_jname##MethodV(this, clazz, methodID, args); \ + va_end(args); \ + return result; \ + } +#define CALL_STATIC_TYPE_METHODV(_jtype, _jname) \ + _jtype CallStatic##_jname##MethodV( \ + jclass clazz, jmethodID methodID, va_list args) { \ + return functions->CallStatic##_jname##MethodV( \ + this, clazz, methodID, args); \ + } +#define CALL_STATIC_TYPE_METHODA(_jtype, _jname) \ + _jtype CallStatic##_jname##MethodA( \ + jclass clazz, jmethodID methodID, jvalue *args) { \ + return functions->CallStatic##_jname##MethodA( \ + this, clazz, methodID, args); \ + } + +#define CALL_STATIC_TYPE(_jtype, _jname) \ + CALL_STATIC_TYPE_METHOD(_jtype, _jname) \ + CALL_STATIC_TYPE_METHODV(_jtype, _jname) \ + CALL_STATIC_TYPE_METHODA(_jtype, _jname) + + CALL_STATIC_TYPE(jobject, Object) + CALL_STATIC_TYPE(jboolean, Boolean) + CALL_STATIC_TYPE(jbyte, Byte) + CALL_STATIC_TYPE(jchar, Char) + CALL_STATIC_TYPE(jshort, Short) + CALL_STATIC_TYPE(jint, Int) + CALL_STATIC_TYPE(jlong, Long) + CALL_STATIC_TYPE(jfloat, Float) + CALL_STATIC_TYPE(jdouble, Double) + + void CallStaticVoidMethod(jclass clazz, jmethodID methodID, ...) { + va_list args; + va_start(args, methodID); + functions->CallStaticVoidMethodV(this, clazz, methodID, args); + va_end(args); + } + void CallStaticVoidMethodV(jclass clazz, jmethodID methodID, va_list args) { + functions->CallStaticVoidMethodV(this, clazz, methodID, args); + } + void CallStaticVoidMethodA(jclass clazz, jmethodID methodID, jvalue *args) { + functions->CallStaticVoidMethodA(this, clazz, methodID, args); + } + + jfieldID GetStaticFieldID(jclass clazz, const char *name, const char *sig) { + return functions->GetStaticFieldID(this, clazz, name, sig); + } + + jobject GetStaticObjectField(jclass clazz, jfieldID fieldID) { + return functions->GetStaticObjectField(this, clazz, fieldID); + } + jboolean GetStaticBooleanField(jclass clazz, jfieldID fieldID) { + return functions->GetStaticBooleanField(this, clazz, fieldID); + } + jbyte GetStaticByteField(jclass clazz, jfieldID fieldID) { + return functions->GetStaticByteField(this, clazz, fieldID); + } + jchar GetStaticCharField(jclass clazz, jfieldID fieldID) { + return functions->GetStaticCharField(this, clazz, fieldID); + } + jshort GetStaticShortField(jclass clazz, jfieldID fieldID) { + return functions->GetStaticShortField(this, clazz, fieldID); + } + jint GetStaticIntField(jclass clazz, jfieldID fieldID) { + return functions->GetStaticIntField(this, clazz, fieldID); + } + jlong GetStaticLongField(jclass clazz, jfieldID fieldID) { + return functions->GetStaticLongField(this, clazz, fieldID); + } + jfloat GetStaticFloatField(jclass clazz, jfieldID fieldID) { + return functions->GetStaticFloatField(this, clazz, fieldID); + } + jdouble GetStaticDoubleField(jclass clazz, jfieldID fieldID) { + return functions->GetStaticDoubleField(this, clazz, fieldID); + } + + void SetStaticObjectField(jclass clazz, jfieldID fieldID, jobject value) { + functions->SetStaticObjectField(this, clazz, fieldID, value); + } + void SetStaticBooleanField(jclass clazz, jfieldID fieldID, jboolean value) { + functions->SetStaticBooleanField(this, clazz, fieldID, value); + } + void SetStaticByteField(jclass clazz, jfieldID fieldID, jbyte value) { + functions->SetStaticByteField(this, clazz, fieldID, value); + } + void SetStaticCharField(jclass clazz, jfieldID fieldID, jchar value) { + functions->SetStaticCharField(this, clazz, fieldID, value); + } + void SetStaticShortField(jclass clazz, jfieldID fieldID, jshort value) { + functions->SetStaticShortField(this, clazz, fieldID, value); + } + void SetStaticIntField(jclass clazz, jfieldID fieldID, jint value) { + functions->SetStaticIntField(this, clazz, fieldID, value); + } + void SetStaticLongField(jclass clazz, jfieldID fieldID, jlong value) { + functions->SetStaticLongField(this, clazz, fieldID, value); + } + void SetStaticFloatField(jclass clazz, jfieldID fieldID, jfloat value) { + functions->SetStaticFloatField(this, clazz, fieldID, value); + } + void SetStaticDoubleField(jclass clazz, jfieldID fieldID, jdouble value) { + functions->SetStaticDoubleField(this, clazz, fieldID, value); + } + + jstring NewString(const jchar *unicodeChars, jsize len) { + return functions->NewString(this, unicodeChars, len); + } + + jsize GetStringLength(jstring string) { + return functions->GetStringLength(this, string); + } + + const jchar *GetStringChars(jstring string, jboolean *isCopy) { + return functions->GetStringChars(this, string, isCopy); + } + + void ReleaseStringChars(jstring string, const jchar *chars) { + functions->ReleaseStringChars(this, string, chars); + } + + jstring NewStringUTF(const char *bytes) { + return functions->NewStringUTF(this, bytes); + } + + jsize GetStringUTFLength(jstring string) { + return functions->GetStringUTFLength(this, string); + } + + const char *GetStringUTFChars(jstring string, jboolean *isCopy) { + return functions->GetStringUTFChars(this, string, isCopy); + } + + void ReleaseStringUTFChars(jstring string, const char *utf) { + functions->ReleaseStringUTFChars(this, string, utf); + } + + jsize GetArrayLength(jarray array) { + return functions->GetArrayLength(this, array); + } + + jobjectArray + NewObjectArray(jsize length, jclass elementClass, jobject initialElement) { + return functions->NewObjectArray( + this, length, elementClass, initialElement); + } + + jobject GetObjectArrayElement(jobjectArray array, jsize index) { + return functions->GetObjectArrayElement(this, array, index); + } + + void SetObjectArrayElement(jobjectArray array, jsize index, jobject value) { + functions->SetObjectArrayElement(this, array, index, value); + } + + jbooleanArray NewBooleanArray(jsize length) { + return functions->NewBooleanArray(this, length); + } + jbyteArray NewByteArray(jsize length) { + return functions->NewByteArray(this, length); + } + jcharArray NewCharArray(jsize length) { + return functions->NewCharArray(this, length); + } + jshortArray NewShortArray(jsize length) { + return functions->NewShortArray(this, length); + } + jintArray NewIntArray(jsize length) { + return functions->NewIntArray(this, length); + } + jlongArray NewLongArray(jsize length) { + return functions->NewLongArray(this, length); + } + jfloatArray NewFloatArray(jsize length) { + return functions->NewFloatArray(this, length); + } + jdoubleArray NewDoubleArray(jsize length) { + return functions->NewDoubleArray(this, length); + } + + jboolean *GetBooleanArrayElements(jbooleanArray array, jboolean *isCopy) { + return functions->GetBooleanArrayElements(this, array, isCopy); + } + jbyte *GetByteArrayElements(jbyteArray array, jboolean *isCopy) { + return functions->GetByteArrayElements(this, array, isCopy); + } + jchar *GetCharArrayElements(jcharArray array, jboolean *isCopy) { + return functions->GetCharArrayElements(this, array, isCopy); + } + jshort *GetShortArrayElements(jshortArray array, jboolean *isCopy) { + return functions->GetShortArrayElements(this, array, isCopy); + } + jint *GetIntArrayElements(jintArray array, jboolean *isCopy) { + return functions->GetIntArrayElements(this, array, isCopy); + } + jlong *GetLongArrayElements(jlongArray array, jboolean *isCopy) { + return functions->GetLongArrayElements(this, array, isCopy); + } + jfloat *GetFloatArrayElements(jfloatArray array, jboolean *isCopy) { + return functions->GetFloatArrayElements(this, array, isCopy); + } + jdouble *GetDoubleArrayElements(jdoubleArray array, jboolean *isCopy) { + return functions->GetDoubleArrayElements(this, array, isCopy); + } + + void + ReleaseBooleanArrayElements(jbooleanArray array, jboolean *elems, jint mode) { + functions->ReleaseBooleanArrayElements(this, array, elems, mode); + } + void ReleaseByteArrayElements(jbyteArray array, jbyte *elems, jint mode) { + functions->ReleaseByteArrayElements(this, array, elems, mode); + } + void ReleaseCharArrayElements(jcharArray array, jchar *elems, jint mode) { + functions->ReleaseCharArrayElements(this, array, elems, mode); + } + void ReleaseShortArrayElements(jshortArray array, jshort *elems, jint mode) { + functions->ReleaseShortArrayElements(this, array, elems, mode); + } + void ReleaseIntArrayElements(jintArray array, jint *elems, jint mode) { + functions->ReleaseIntArrayElements(this, array, elems, mode); + } + void ReleaseLongArrayElements(jlongArray array, jlong *elems, jint mode) { + functions->ReleaseLongArrayElements(this, array, elems, mode); + } + void ReleaseFloatArrayElements(jfloatArray array, jfloat *elems, jint mode) { + functions->ReleaseFloatArrayElements(this, array, elems, mode); + } + void + ReleaseDoubleArrayElements(jdoubleArray array, jdouble *elems, jint mode) { + functions->ReleaseDoubleArrayElements(this, array, elems, mode); + } + + void GetBooleanArrayRegion( + jbooleanArray array, + jsize start, + jsize len, + jboolean *buf) { + functions->GetBooleanArrayRegion(this, array, start, len, buf); + } + void + GetByteArrayRegion(jbyteArray array, jsize start, jsize len, jbyte *buf) { + functions->GetByteArrayRegion(this, array, start, len, buf); + } + void + GetCharArrayRegion(jcharArray array, jsize start, jsize len, jchar *buf) { + functions->GetCharArrayRegion(this, array, start, len, buf); + } + void + GetShortArrayRegion(jshortArray array, jsize start, jsize len, jshort *buf) { + functions->GetShortArrayRegion(this, array, start, len, buf); + } + void GetIntArrayRegion(jintArray array, jsize start, jsize len, jint *buf) { + functions->GetIntArrayRegion(this, array, start, len, buf); + } + void + GetLongArrayRegion(jlongArray array, jsize start, jsize len, jlong *buf) { + functions->GetLongArrayRegion(this, array, start, len, buf); + } + void + GetFloatArrayRegion(jfloatArray array, jsize start, jsize len, jfloat *buf) { + functions->GetFloatArrayRegion(this, array, start, len, buf); + } + void GetDoubleArrayRegion( + jdoubleArray array, + jsize start, + jsize len, + jdouble *buf) { + functions->GetDoubleArrayRegion(this, array, start, len, buf); + } + + void SetBooleanArrayRegion( + jbooleanArray array, + jsize start, + jsize len, + const jboolean *buf) { + functions->SetBooleanArrayRegion(this, array, start, len, buf); + } + void SetByteArrayRegion( + jbyteArray array, + jsize start, + jsize len, + const jbyte *buf) { + functions->SetByteArrayRegion(this, array, start, len, buf); + } + void SetCharArrayRegion( + jcharArray array, + jsize start, + jsize len, + const jchar *buf) { + functions->SetCharArrayRegion(this, array, start, len, buf); + } + void SetShortArrayRegion( + jshortArray array, + jsize start, + jsize len, + const jshort *buf) { + functions->SetShortArrayRegion(this, array, start, len, buf); + } + void + SetIntArrayRegion(jintArray array, jsize start, jsize len, const jint *buf) { + functions->SetIntArrayRegion(this, array, start, len, buf); + } + void SetLongArrayRegion( + jlongArray array, + jsize start, + jsize len, + const jlong *buf) { + functions->SetLongArrayRegion(this, array, start, len, buf); + } + void SetFloatArrayRegion( + jfloatArray array, + jsize start, + jsize len, + const jfloat *buf) { + functions->SetFloatArrayRegion(this, array, start, len, buf); + } + void SetDoubleArrayRegion( + jdoubleArray array, + jsize start, + jsize len, + const jdouble *buf) { + functions->SetDoubleArrayRegion(this, array, start, len, buf); + } + + jint + RegisterNatives(jclass clazz, const JNINativeMethod *methods, jint nMethods) { + return functions->RegisterNatives(this, clazz, methods, nMethods); + } + + jint UnregisterNatives(jclass clazz) { + return functions->UnregisterNatives(this, clazz); + } + + jint MonitorEnter(jobject obj) { + return functions->MonitorEnter(this, obj); + } + + jint MonitorExit(jobject obj) { + return functions->MonitorExit(this, obj); + } + + jint GetJavaVM(JavaVM **vm) { + return functions->GetJavaVM(this, vm); + } + + void GetStringRegion(jstring str, jsize start, jsize len, jchar *buf) { + functions->GetStringRegion(this, str, start, len, buf); + } + + void GetStringUTFRegion(jstring str, jsize start, jsize len, char *buf) { + return functions->GetStringUTFRegion(this, str, start, len, buf); + } + + void *GetPrimitiveArrayCritical(jarray array, jboolean *isCopy) { + return functions->GetPrimitiveArrayCritical(this, array, isCopy); + } + + void ReleasePrimitiveArrayCritical(jarray array, void *carray, jint mode) { + functions->ReleasePrimitiveArrayCritical(this, array, carray, mode); + } + + const jchar *GetStringCritical(jstring string, jboolean *isCopy) { + return functions->GetStringCritical(this, string, isCopy); + } + + void ReleaseStringCritical(jstring string, const jchar *carray) { + functions->ReleaseStringCritical(this, string, carray); + } + + jweak NewWeakGlobalRef(jobject obj) { + return functions->NewWeakGlobalRef(this, obj); + } + + void DeleteWeakGlobalRef(jweak obj) { + functions->DeleteWeakGlobalRef(this, obj); + } + + jboolean ExceptionCheck() { + return functions->ExceptionCheck(this); + } + + jobject NewDirectByteBuffer(void *address, jlong capacity) { + return functions->NewDirectByteBuffer(this, address, capacity); + } + + void *GetDirectBufferAddress(jobject buf) { + return functions->GetDirectBufferAddress(this, buf); + } + + jlong GetDirectBufferCapacity(jobject buf) { + return functions->GetDirectBufferCapacity(this, buf); + } + + /* added in JNI 1.6 */ + jobjectRefType GetObjectRefType(jobject obj) { + return functions->GetObjectRefType(this, obj); + } #endif /*__cplusplus*/ }; - /* * JNI invocation interface. */ struct JNIInvokeInterface { - void* reserved0; - void* reserved1; - void* reserved2; + void *reserved0; + void *reserved1; + void *reserved2; - jint (*DestroyJavaVM)(JavaVM*); - jint (*AttachCurrentThread)(JavaVM*, JNIEnv**, void*); - jint (*DetachCurrentThread)(JavaVM*); - jint (*GetEnv)(JavaVM*, void**, jint); - jint (*AttachCurrentThreadAsDaemon)(JavaVM*, JNIEnv**, void*); + jint (*DestroyJavaVM)(JavaVM *); + jint (*AttachCurrentThread)(JavaVM *, JNIEnv **, void *); + jint (*DetachCurrentThread)(JavaVM *); + jint (*GetEnv)(JavaVM *, void **, jint); + jint (*AttachCurrentThreadAsDaemon)(JavaVM *, JNIEnv **, void *); }; /* * C++ version. */ struct _JavaVM { - const struct JNIInvokeInterface* functions; + const struct JNIInvokeInterface *functions; #if defined(__cplusplus) - jint DestroyJavaVM() - { return functions->DestroyJavaVM(this); } - jint AttachCurrentThread(JNIEnv** p_env, void* thr_args) - { return functions->AttachCurrentThread(this, p_env, thr_args); } - jint DetachCurrentThread() - { return functions->DetachCurrentThread(this); } - jint GetEnv(void** env, jint version) - { return functions->GetEnv(this, env, version); } - jint AttachCurrentThreadAsDaemon(JNIEnv** p_env, void* thr_args) - { return functions->AttachCurrentThreadAsDaemon(this, p_env, thr_args); } + jint DestroyJavaVM() { + return functions->DestroyJavaVM(this); + } + jint AttachCurrentThread(JNIEnv **p_env, void *thr_args) { + return functions->AttachCurrentThread(this, p_env, thr_args); + } + jint DetachCurrentThread() { + return functions->DetachCurrentThread(this); + } + jint GetEnv(void **env, jint version) { + return functions->GetEnv(this, env, version); + } + jint AttachCurrentThreadAsDaemon(JNIEnv **p_env, void *thr_args) { + return functions->AttachCurrentThreadAsDaemon(this, p_env, thr_args); + } #endif /*__cplusplus*/ }; struct JavaVMAttachArgs { - jint version; /* must be >= JNI_VERSION_1_2 */ - const char* name; /* NULL or name of thread as modified UTF-8 str */ - jobject group; /* global ref of a ThreadGroup object, or NULL */ + jint version; /* must be >= JNI_VERSION_1_2 */ + const char *name; /* NULL or name of thread as modified UTF-8 str */ + jobject group; /* global ref of a ThreadGroup object, or NULL */ }; typedef struct JavaVMAttachArgs JavaVMAttachArgs; @@ -1079,16 +1320,16 @@ typedef struct JavaVMAttachArgs JavaVMAttachArgs; * longer supported.) */ typedef struct JavaVMOption { - const char* optionString; - void* extraInfo; + const char *optionString; + void *extraInfo; } JavaVMOption; typedef struct JavaVMInitArgs { - jint version; /* use JNI_VERSION_1_2 or later */ + jint version; /* use JNI_VERSION_1_2 or later */ - jint nOptions; - JavaVMOption* options; - jboolean ignoreUnrecognized; + jint nOptions; + JavaVMOption *options; + jboolean ignoreUnrecognized; } JavaVMInitArgs; #ifdef __cplusplus @@ -1099,43 +1340,42 @@ extern "C" { * * Note these are the only symbols exported for JNI by the VM. */ -jint JNI_GetDefaultJavaVMInitArgs(void*); -jint JNI_CreateJavaVM(JavaVM**, JNIEnv**, void*); -jint JNI_GetCreatedJavaVMs(JavaVM**, jsize, jsize*); +jint JNI_GetDefaultJavaVMInitArgs(void *); +jint JNI_CreateJavaVM(JavaVM **, JNIEnv **, void *); +jint JNI_GetCreatedJavaVMs(JavaVM **, jsize, jsize *); #define JNIIMPORT -#define JNIEXPORT __attribute__ ((visibility ("default"))) +#define JNIEXPORT __attribute__((visibility("default"))) #define JNICALL /* * Prototypes for functions exported by loadable shared libs. These are * called by JNI, not provided by JNI. */ -JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved); -JNIEXPORT void JNI_OnUnload(JavaVM* vm, void* reserved); +JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved); +JNIEXPORT void JNI_OnUnload(JavaVM *vm, void *reserved); #ifdef __cplusplus } #endif - /* * Manifest constants. */ -#define JNI_FALSE 0 -#define JNI_TRUE 1 +#define JNI_FALSE 0 +#define JNI_TRUE 1 #define JNI_VERSION_1_1 0x00010001 #define JNI_VERSION_1_2 0x00010002 #define JNI_VERSION_1_4 0x00010004 #define JNI_VERSION_1_6 0x00010006 -#define JNI_OK (0) /* no error */ -#define JNI_ERR (-1) /* generic error */ -#define JNI_EDETACHED (-2) /* thread detached from the VM */ -#define JNI_EVERSION (-3) /* JNI version error */ +#define JNI_OK (0) /* no error */ +#define JNI_ERR (-1) /* generic error */ +#define JNI_EDETACHED (-2) /* thread detached from the VM */ +#define JNI_EVERSION (-3) /* JNI version error */ -#define JNI_COMMIT 1 /* copy content, do not free buffer */ -#define JNI_ABORT 2 /* free buffer w/o copying back */ +#define JNI_COMMIT 1 /* copy content, do not free buffer */ +#define JNI_ABORT 2 /* free buffer w/o copying back */ -#endif /* JNI_H_ */ +#endif /* JNI_H_ */ diff --git a/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapper.cpp b/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapper.cpp index 62bababc332..1d183271f2e 100644 --- a/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapper.cpp +++ b/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapper.cpp @@ -20,33 +20,40 @@ namespace facebook { namespace react { jni::local_ref CxxModuleWrapper::makeDsoNative( - jni::alias_ref, const std::string& soPath, const std::string& fname) { + jni::alias_ref, + const std::string &soPath, + const std::string &fname) { // soPath is the path of a library which has already been loaded by // java SoLoader.loadLibrary(). So this returns the same handle, // and increments the reference counter. We can't just use // dlsym(RTLD_DEFAULT, ...), because that crashes on 4.4.2 and // earlier: https://code.google.com/p/android/issues/detail?id=61799 - void* handle = dlopen(soPath.c_str(), RTLD_NOW); + void *handle = dlopen(soPath.c_str(), RTLD_NOW); if (!handle) { - throwNewJavaException(gJavaLangIllegalArgumentException, - "module shared library %s is not found", soPath.c_str()); + throwNewJavaException( + gJavaLangIllegalArgumentException, + "module shared library %s is not found", + soPath.c_str()); } - // Now, arrange to close the handle so the counter is decremented. - // The handle will remain valid until java closes it. There's no - // way to do this on Android, but that's no reason to be sloppy - // here. + // Now, arrange to close the handle so the counter is decremented. + // The handle will remain valid until java closes it. There's no + // way to do this on Android, but that's no reason to be sloppy + // here. auto guard = folly::makeGuard([&] { CHECK(dlclose(handle) == 0); }); - void* sym = dlsym(handle, fname.c_str()); + void *sym = dlsym(handle, fname.c_str()); if (!sym) { - throwNewJavaException(gJavaLangIllegalArgumentException, - "module function %s in shared library %s is not found", - fname.c_str(), soPath.c_str()); + throwNewJavaException( + gJavaLangIllegalArgumentException, + "module function %s in shared library %s is not found", + fname.c_str(), + soPath.c_str()); } - auto factory = reinterpret_cast(sym); + auto factory = reinterpret_cast(sym); - return CxxModuleWrapper::newObjectCxxArgs(std::unique_ptr((*factory)())); + return CxxModuleWrapper::newObjectCxxArgs( + std::unique_ptr((*factory)())); } -} -} +} // namespace react +} // namespace facebook diff --git a/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapper.h b/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapper.h index 15ffaa013cc..2ffe575263d 100644 --- a/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapper.h +++ b/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapper.h @@ -12,19 +12,21 @@ namespace facebook { namespace react { -class CxxModuleWrapper : public jni::HybridClass { -public: +class CxxModuleWrapper + : public jni::HybridClass { + public: constexpr static const char *const kJavaDescriptor = - "Lcom/facebook/react/bridge/CxxModuleWrapper;"; + "Lcom/facebook/react/bridge/CxxModuleWrapper;"; static void registerNatives() { - registerHybrid({ - makeNativeMethod("makeDsoNative", CxxModuleWrapper::makeDsoNative) - }); + registerHybrid( + {makeNativeMethod("makeDsoNative", CxxModuleWrapper::makeDsoNative)}); } static jni::local_ref makeDsoNative( - jni::alias_ref, const std::string& soPath, const std::string& fname); + jni::alias_ref, + const std::string &soPath, + const std::string &fname); std::string getName() override { return module_->getName(); @@ -35,14 +37,14 @@ public: return std::move(module_); } -protected: + protected: friend HybridBase; explicit CxxModuleWrapper(std::unique_ptr module) - : module_(std::move(module)) {} + : module_(std::move(module)) {} std::unique_ptr module_; }; -} -} +} // namespace react +} // namespace facebook diff --git a/ReactAndroid/src/main/jni/react/jni/CxxSharedModuleWrapper.h b/ReactAndroid/src/main/jni/react/jni/CxxSharedModuleWrapper.h index 869bbf03888..19178ff8ccc 100644 --- a/ReactAndroid/src/main/jni/react/jni/CxxSharedModuleWrapper.h +++ b/ReactAndroid/src/main/jni/react/jni/CxxSharedModuleWrapper.h @@ -14,7 +14,7 @@ namespace facebook { namespace react { -class CxxSharedModuleWrapper: public CxxModuleWrapperBase { +class CxxSharedModuleWrapper : public CxxModuleWrapperBase { public: std::string getName() override { return shared_->getName(); @@ -27,12 +27,13 @@ class CxxSharedModuleWrapper: public CxxModuleWrapperBase { return std::make_unique(shared_); } -protected: - explicit CxxSharedModuleWrapper(std::unique_ptr module) - : shared_(std::move(module)) {} + protected: + explicit CxxSharedModuleWrapper( + std::unique_ptr module) + : shared_(std::move(module)) {} std::shared_ptr shared_; }; -} -} +} // namespace react +} // namespace facebook diff --git a/ReactAndroid/src/main/jni/react/jni/JInspector.cpp b/ReactAndroid/src/main/jni/react/jni/JInspector.cpp index 329a686e078..1fbe238b9e0 100644 --- a/ReactAndroid/src/main/jni/react/jni/JInspector.cpp +++ b/ReactAndroid/src/main/jni/react/jni/JInspector.cpp @@ -17,7 +17,7 @@ namespace react { namespace { class RemoteConnection : public IRemoteConnection { -public: + public: RemoteConnection(jni::alias_ref connection) : connection_(jni::make_global(connection)) {} @@ -28,19 +28,27 @@ public: virtual void onDisconnect() override { connection_->onDisconnect(); } -private: + + private: jni::global_ref connection_; }; +} // namespace + +jni::local_ref +JPage::create(int id, const std::string &title, const std::string &vm) { + static auto constructor = javaClassStatic() + ->getConstructor, + jni::local_ref)>(); + return javaClassStatic()->newObject( + constructor, id, jni::make_jstring(title), jni::make_jstring(vm)); } -jni::local_ref JPage::create(int id, const std::string& title, const std::string& vm) { - static auto constructor = javaClassStatic()->getConstructor, jni::local_ref)>(); - return javaClassStatic()->newObject(constructor, id, jni::make_jstring(title), jni::make_jstring(vm)); -} - -void JRemoteConnection::onMessage(const std::string& message) const { - static auto method = javaClassStatic()->getMethod)>("onMessage"); +void JRemoteConnection::onMessage(const std::string &message) const { + static auto method = + javaClassStatic()->getMethod)>("onMessage"); method(self(), jni::make_jstring(message)); } @@ -50,7 +58,7 @@ void JRemoteConnection::onDisconnect() const { } JLocalConnection::JLocalConnection(std::unique_ptr connection) - : connection_(std::move(connection)) {} + : connection_(std::move(connection)) {} void JLocalConnection::sendMessage(std::string message) { connection_->sendMessage(std::move(message)); @@ -67,8 +75,10 @@ void JLocalConnection::registerNatives() { }); } -jni::global_ref JInspector::instance(jni::alias_ref) { - static auto instance = jni::make_global(newObjectCxxArgs(&getInspectorInstance())); +jni::global_ref JInspector::instance( + jni::alias_ref) { + static auto instance = + jni::make_global(newObjectCxxArgs(&getInspectorInstance())); return instance; } @@ -81,8 +91,11 @@ jni::local_ref> JInspector::getPages() { return array; } -jni::local_ref JInspector::connect(int pageId, jni::alias_ref remote) { - auto localConnection = inspector_->connect(pageId, std::make_unique(std::move(remote))); +jni::local_ref JInspector::connect( + int pageId, + jni::alias_ref remote) { + auto localConnection = inspector_->connect( + pageId, std::make_unique(std::move(remote))); return JLocalConnection::newObjectCxxArgs(std::move(localConnection)); } @@ -95,7 +108,7 @@ void JInspector::registerNatives() { }); } -} -} +} // namespace react +} // namespace facebook #endif diff --git a/ReactAndroid/src/main/jni/react/jni/JNativeRunnable.h b/ReactAndroid/src/main/jni/react/jni/JNativeRunnable.h index 664d1e3e522..b45d84c90a6 100644 --- a/ReactAndroid/src/main/jni/react/jni/JNativeRunnable.h +++ b/ReactAndroid/src/main/jni/react/jni/JNativeRunnable.h @@ -17,7 +17,7 @@ namespace facebook { namespace react { class Runnable : public JavaClass { -public: + public: static constexpr auto kJavaDescriptor = "Ljava/lang/Runnable;"; }; @@ -25,8 +25,9 @@ public: * The c++ interface for the Java NativeRunnable class */ class JNativeRunnable : public HybridClass { -public: - static auto constexpr kJavaDescriptor = "Lcom/facebook/react/bridge/queue/NativeRunnable;"; + public: + static auto constexpr kJavaDescriptor = + "Lcom/facebook/react/bridge/queue/NativeRunnable;"; void run() { m_runnable(); @@ -37,7 +38,8 @@ public: makeNativeMethod("run", JNativeRunnable::run), }); } -private: + + private: friend HybridBase; JNativeRunnable(std::function runnable) @@ -46,4 +48,5 @@ private: std::function m_runnable; }; -} } +} // namespace react +} // namespace facebook diff --git a/ReactAndroid/src/main/jni/react/jni/JSLogging.cpp b/ReactAndroid/src/main/jni/react/jni/JSLogging.cpp index bb6b3f63b85..6a174e6634b 100644 --- a/ReactAndroid/src/main/jni/react/jni/JSLogging.cpp +++ b/ReactAndroid/src/main/jni/react/jni/JSLogging.cpp @@ -13,13 +13,13 @@ namespace facebook { namespace react { void reactAndroidLoggingHook( - const std::string& message, + const std::string &message, android_LogPriority logLevel) { FBLOG_PRI(logLevel, "ReactNativeJS", "%s", message.c_str()); } void reactAndroidLoggingHook( - const std::string& message, + const std::string &message, unsigned int logLevel) { reactAndroidLoggingHook( message, static_cast(logLevel + ANDROID_LOG_DEBUG)); diff --git a/ReactAndroid/src/main/jni/react/jni/JSLogging.h b/ReactAndroid/src/main/jni/react/jni/JSLogging.h index 39062d3517e..3d853200fb3 100644 --- a/ReactAndroid/src/main/jni/react/jni/JSLogging.h +++ b/ReactAndroid/src/main/jni/react/jni/JSLogging.h @@ -14,11 +14,9 @@ namespace facebook { namespace react { void reactAndroidLoggingHook( - const std::string& message, + const std::string &message, android_LogPriority logLevel); -void reactAndroidLoggingHook( - const std::string& message, - unsigned int logLevel); +void reactAndroidLoggingHook(const std::string &message, unsigned int logLevel); } // namespace react } // namespace facebook diff --git a/ReactAndroid/src/main/jni/react/jni/JniJSModulesUnbundle.cpp b/ReactAndroid/src/main/jni/react/jni/JniJSModulesUnbundle.cpp index 5c632d44f7a..f99243200c2 100644 --- a/ReactAndroid/src/main/jni/react/jni/JniJSModulesUnbundle.cpp +++ b/ReactAndroid/src/main/jni/react/jni/JniJSModulesUnbundle.cpp @@ -7,25 +7,25 @@ #include "JniJSModulesUnbundle.h" -#include #include #include +#include +#include #include #include -#include #include using magic_number_t = uint32_t; const magic_number_t MAGIC_FILE_HEADER = 0xFB0BD1E5; -const char* MAGIC_FILE_NAME = "UNBUNDLE"; +const char *MAGIC_FILE_NAME = "UNBUNDLE"; namespace facebook { namespace react { using asset_ptr = - std::unique_ptr>; + std::unique_ptr>; -static std::string jsModulesDir(const std::string& entryFile) { +static std::string jsModulesDir(const std::string &entryFile) { std::string dir = dirname(entryFile.c_str()); // android's asset manager does not work with paths that start with a dot @@ -34,26 +34,27 @@ static std::string jsModulesDir(const std::string& entryFile) { static asset_ptr openAsset( AAssetManager *manager, - const std::string& fileName, + const std::string &fileName, int mode = AASSET_MODE_STREAMING) { return asset_ptr( - AAssetManager_open(manager, fileName.c_str(), mode), - AAsset_close); + AAssetManager_open(manager, fileName.c_str(), mode), AAsset_close); } std::unique_ptr JniJSModulesUnbundle::fromEntryFile( - AAssetManager *assetManager, - const std::string& entryFile) { - return std::make_unique(assetManager, jsModulesDir(entryFile)); - } + AAssetManager *assetManager, + const std::string &entryFile) { + return std::make_unique( + assetManager, jsModulesDir(entryFile)); +} -JniJSModulesUnbundle::JniJSModulesUnbundle(AAssetManager *assetManager, const std::string& moduleDirectory) : - m_assetManager(assetManager), - m_moduleDirectory(moduleDirectory) {} +JniJSModulesUnbundle::JniJSModulesUnbundle( + AAssetManager *assetManager, + const std::string &moduleDirectory) + : m_assetManager(assetManager), m_moduleDirectory(moduleDirectory) {} bool JniJSModulesUnbundle::isUnbundle( AAssetManager *assetManager, - const std::string& assetName) { + const std::string &assetName) { if (!assetManager) { return false; } @@ -69,9 +70,12 @@ bool JniJSModulesUnbundle::isUnbundle( return fileHeader == htole32(MAGIC_FILE_HEADER); } -JSModulesUnbundle::Module JniJSModulesUnbundle::getModule(uint32_t moduleId) const { +JSModulesUnbundle::Module JniJSModulesUnbundle::getModule( + uint32_t moduleId) const { // can be nullptr for default constructor. - FBASSERTMSGF(m_assetManager != nullptr, "Unbundle has not been initialized with an asset manager"); + FBASSERTMSGF( + m_assetManager != nullptr, + "Unbundle has not been initialized with an asset manager"); std::ostringstream sourceUrlBuilder; sourceUrlBuilder << moduleId << ".js"; @@ -90,5 +94,5 @@ JSModulesUnbundle::Module JniJSModulesUnbundle::getModule(uint32_t moduleId) con return {sourceUrl, std::string(buffer, AAsset_getLength(asset.get()))}; } -} -} +} // namespace react +} // namespace facebook diff --git a/ReactAndroid/src/main/jni/react/jni/JniJSModulesUnbundle.h b/ReactAndroid/src/main/jni/react/jni/JniJSModulesUnbundle.h index 27ee9f3b3d2..68f41a3d698 100644 --- a/ReactAndroid/src/main/jni/react/jni/JniJSModulesUnbundle.h +++ b/ReactAndroid/src/main/jni/react/jni/JniJSModulesUnbundle.h @@ -19,22 +19,27 @@ class JniJSModulesUnbundle : public JSModulesUnbundle { /** * This implementation reads modules as single file from the assets of an apk. */ -public: + public: JniJSModulesUnbundle() = default; - JniJSModulesUnbundle(AAssetManager *assetManager, const std::string& moduleDirectory); - JniJSModulesUnbundle(JniJSModulesUnbundle&& other) = delete; - JniJSModulesUnbundle& operator= (JSModulesUnbundle&& other) = delete; + JniJSModulesUnbundle( + AAssetManager *assetManager, + const std::string &moduleDirectory); + JniJSModulesUnbundle(JniJSModulesUnbundle &&other) = delete; + JniJSModulesUnbundle &operator=(JSModulesUnbundle &&other) = delete; - static std::unique_ptr fromEntryFile(AAssetManager *assetManager, const std::string& entryFile); + static std::unique_ptr fromEntryFile( + AAssetManager *assetManager, + const std::string &entryFile); static bool isUnbundle( - AAssetManager *assetManager, - const std::string& assetName); + AAssetManager *assetManager, + const std::string &assetName); virtual Module getModule(uint32_t moduleId) const override; -private: + + private: AAssetManager *m_assetManager = nullptr; std::string m_moduleDirectory; }; -} -} +} // namespace react +} // namespace facebook diff --git a/ReactAndroid/src/main/jni/react/jni/ModuleRegistryBuilder.cpp b/ReactAndroid/src/main/jni/react/jni/ModuleRegistryBuilder.cpp index 09b2a078c25..b239481e7c6 100644 --- a/ReactAndroid/src/main/jni/react/jni/ModuleRegistryBuilder.cpp +++ b/ReactAndroid/src/main/jni/react/jni/ModuleRegistryBuilder.cpp @@ -7,9 +7,9 @@ #include "ModuleRegistryBuilder.h" +#include #include #include -#include #include @@ -21,11 +21,12 @@ std::string ModuleHolder::getName() const { return method(self())->toStdString(); } -xplat::module::CxxModule::Provider ModuleHolder::getProvider(const std::string& moduleName) const { - return [self=jni::make_global(self()), moduleName] { +xplat::module::CxxModule::Provider ModuleHolder::getProvider( + const std::string &moduleName) const { + return [self = jni::make_global(self()), moduleName] { static auto getModule = - ModuleHolder::javaClassStatic()->getMethod( - "getModule"); + ModuleHolder::javaClassStatic()->getMethod( + "getModule"); // This is the call which uses the lazy Java Provider to instantiate the // Java CxxModuleWrapper which contains the CxxModule. auto module = getModule(self); @@ -33,7 +34,8 @@ xplat::module::CxxModule::Provider ModuleHolder::getProvider(const std::string& CHECK(module->isInstanceOf(CxxModuleWrapperBase::javaClassStatic())) << "NativeModule '" << moduleName << "' isn't a C++ module"; - auto cxxModule = jni::static_ref_cast(module); + auto cxxModule = + jni::static_ref_cast(module); // Then, we grab the CxxModule from the wrapper, which is no longer needed. return cxxModule->cthis()->getModule(); }; @@ -41,24 +43,30 @@ xplat::module::CxxModule::Provider ModuleHolder::getProvider(const std::string& std::vector> buildNativeModuleList( std::weak_ptr winstance, - jni::alias_ref::javaobject> javaModules, - jni::alias_ref::javaobject> cxxModules, + jni::alias_ref::javaobject> + javaModules, + jni::alias_ref::javaobject> + cxxModules, std::shared_ptr moduleMessageQueue) { std::vector> modules; if (javaModules) { - for (const auto& jm : *javaModules) { + for (const auto &jm : *javaModules) { modules.emplace_back(std::make_unique( - winstance, jm, moduleMessageQueue)); + winstance, jm, moduleMessageQueue)); } } if (cxxModules) { - for (const auto& cm : *cxxModules) { + for (const auto &cm : *cxxModules) { std::string moduleName = cm->getName(); modules.emplace_back(std::make_unique( - winstance, moduleName, cm->getProvider(moduleName), moduleMessageQueue)); + winstance, + moduleName, + cm->getProvider(moduleName), + moduleMessageQueue)); } } return modules; } -}} +} // namespace react +} // namespace facebook diff --git a/ReactAndroid/src/main/jni/react/jni/NativeCommon.cpp b/ReactAndroid/src/main/jni/react/jni/NativeCommon.cpp index 9e9a4ad5367..b244d45655c 100644 --- a/ReactAndroid/src/main/jni/react/jni/NativeCommon.cpp +++ b/ReactAndroid/src/main/jni/react/jni/NativeCommon.cpp @@ -14,13 +14,13 @@ namespace react { namespace exceptions { const char *gUnexpectedNativeTypeExceptionClass = - "com/facebook/react/bridge/UnexpectedNativeTypeException"; + "com/facebook/react/bridge/UnexpectedNativeTypeException"; } namespace { // Returns a leaked global_ref. -alias_ref getTypeField(const char* fieldName) { +alias_ref getTypeField(const char *fieldName) { static auto cls = ReadableType::javaClassStatic(); auto field = cls->getStaticField(fieldName); return make_global(cls->getStaticFieldValue(field)).release(); @@ -56,7 +56,8 @@ local_ref ReadableType::getType(folly::dynamic::Type type) { return make_local(val); } default: - throwNewJavaException(exceptions::gUnexpectedNativeTypeExceptionClass, "Unknown type"); + throwNewJavaException( + exceptions::gUnexpectedNativeTypeExceptionClass, "Unknown type"); } } diff --git a/ReactAndroid/src/main/jni/react/jni/NativeMap.cpp b/ReactAndroid/src/main/jni/react/jni/NativeMap.cpp index c5540364b64..5f02cb98a9f 100644 --- a/ReactAndroid/src/main/jni/react/jni/NativeMap.cpp +++ b/ReactAndroid/src/main/jni/react/jni/NativeMap.cpp @@ -21,7 +21,7 @@ std::string NativeMap::toString() { void NativeMap::registerNatives() { registerHybrid({ - makeNativeMethod("toString", NativeMap::toString), + makeNativeMethod("toString", NativeMap::toString), }); } @@ -35,5 +35,5 @@ void NativeMap::throwIfConsumed() { exceptions::throwIfObjectAlreadyConsumed(this, "Map already consumed"); } -} // namespace react -} // namespace facebook +} // namespace react +} // namespace facebook diff --git a/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.h b/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.h index 891499105d0..2e89f954e09 100644 --- a/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.h +++ b/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.h @@ -16,21 +16,25 @@ namespace facebook { namespace react { struct ReadableArray : jni::JavaClass { - static auto constexpr kJavaDescriptor = "Lcom/facebook/react/bridge/ReadableArray;"; + static auto constexpr kJavaDescriptor = + "Lcom/facebook/react/bridge/ReadableArray;"; }; -class ReadableNativeArray : public jni::HybridClass { +class ReadableNativeArray + : public jni::HybridClass { protected: friend HybridBase; explicit ReadableNativeArray(folly::dynamic array); public: - static constexpr const char* kJavaDescriptor = "Lcom/facebook/react/bridge/ReadableNativeArray;"; + static constexpr const char *kJavaDescriptor = + "Lcom/facebook/react/bridge/ReadableNativeArray;"; - static void mapException(const std::exception& ex); + static void mapException(const std::exception &ex); jni::local_ref> importArray(); jni::local_ref> importTypeArray(); static void registerNatives(); }; -}} +} // namespace react +} // namespace facebook diff --git a/ReactAndroid/src/main/jni/react/jni/WritableNativeArray.cpp b/ReactAndroid/src/main/jni/react/jni/WritableNativeArray.cpp index 1430a15763e..5040fead9bb 100644 --- a/ReactAndroid/src/main/jni/react/jni/WritableNativeArray.cpp +++ b/ReactAndroid/src/main/jni/react/jni/WritableNativeArray.cpp @@ -17,7 +17,8 @@ namespace react { WritableNativeArray::WritableNativeArray() : HybridBase(folly::dynamic::array()) {} -local_ref WritableNativeArray::initHybrid(alias_ref) { +local_ref WritableNativeArray::initHybrid( + alias_ref) { return makeCxxInstance(); } @@ -50,7 +51,7 @@ void WritableNativeArray::pushString(jstring value) { array_.push_back(wrap_alias(value)->toStdString()); } -void WritableNativeArray::pushNativeArray(WritableNativeArray* otherArray) { +void WritableNativeArray::pushNativeArray(WritableNativeArray *otherArray) { if (otherArray == NULL) { pushNull(); return; @@ -59,7 +60,7 @@ void WritableNativeArray::pushNativeArray(WritableNativeArray* otherArray) { array_.push_back(otherArray->consume()); } -void WritableNativeArray::pushNativeMap(WritableNativeMap* map) { +void WritableNativeArray::pushNativeMap(WritableNativeMap *map) { if (map == NULL) { pushNull(); return; diff --git a/ReactAndroid/src/main/jni/react/jni/WritableNativeMap.cpp b/ReactAndroid/src/main/jni/react/jni/WritableNativeMap.cpp index e347badd068..70c41a44769 100644 --- a/ReactAndroid/src/main/jni/react/jni/WritableNativeMap.cpp +++ b/ReactAndroid/src/main/jni/react/jni/WritableNativeMap.cpp @@ -12,17 +12,17 @@ using namespace facebook::jni; namespace facebook { namespace react { -WritableNativeMap::WritableNativeMap() - : HybridBase(folly::dynamic::object()) {} +WritableNativeMap::WritableNativeMap() : HybridBase(folly::dynamic::object()) {} -WritableNativeMap::WritableNativeMap(folly::dynamic&& val) +WritableNativeMap::WritableNativeMap(folly::dynamic &&val) : HybridBase(std::move(val)) { if (!map_.isObject()) { throw std::runtime_error("WritableNativeMap value must be an object."); } } -local_ref WritableNativeMap::initHybrid(alias_ref) { +local_ref WritableNativeMap::initHybrid( + alias_ref) { return makeCxxInstance(); } @@ -55,7 +55,9 @@ void WritableNativeMap::putString(std::string key, alias_ref val) { map_.insert(std::move(key), val->toString()); } -void WritableNativeMap::putNativeArray(std::string key, WritableNativeArray* otherArray) { +void WritableNativeMap::putNativeArray( + std::string key, + WritableNativeArray *otherArray) { if (!otherArray) { putNull(std::move(key)); return; @@ -64,7 +66,9 @@ void WritableNativeMap::putNativeArray(std::string key, WritableNativeArray* oth map_.insert(key, otherArray->consume()); } -void WritableNativeMap::putNativeMap(std::string key, WritableNativeMap *otherMap) { +void WritableNativeMap::putNativeMap( + std::string key, + WritableNativeMap *otherMap) { if (!otherMap) { putNull(std::move(key)); return; @@ -73,7 +77,7 @@ void WritableNativeMap::putNativeMap(std::string key, WritableNativeMap *otherMa map_.insert(std::move(key), otherMap->consume()); } -void WritableNativeMap::mergeNativeMap(ReadableNativeMap* other) { +void WritableNativeMap::mergeNativeMap(ReadableNativeMap *other) { throwIfConsumed(); other->throwIfConsumed(); @@ -93,7 +97,7 @@ void WritableNativeMap::registerNatives() { makeNativeMethod("putNativeMap", WritableNativeMap::putNativeMap), makeNativeMethod("mergeNativeMap", WritableNativeMap::mergeNativeMap), makeNativeMethod("initHybrid", WritableNativeMap::initHybrid), - }); + }); } } // namespace react diff --git a/ReactCommon/better/.clang-tidy b/ReactCommon/better/.clang-tidy new file mode 100644 index 00000000000..c98fd78ff64 --- /dev/null +++ b/ReactCommon/better/.clang-tidy @@ -0,0 +1,5 @@ +--- +Checks: '> +clang-diagnostic-*, +' +... diff --git a/ReactCommon/config/.clang-tidy b/ReactCommon/config/.clang-tidy new file mode 100644 index 00000000000..c98fd78ff64 --- /dev/null +++ b/ReactCommon/config/.clang-tidy @@ -0,0 +1,5 @@ +--- +Checks: '> +clang-diagnostic-*, +' +... diff --git a/ReactCommon/cxxreact/JsArgumentHelpers-inl.h b/ReactCommon/cxxreact/JsArgumentHelpers-inl.h index f22ec920883..72c2d0d2f6b 100644 --- a/ReactCommon/cxxreact/JsArgumentHelpers-inl.h +++ b/ReactCommon/cxxreact/JsArgumentHelpers-inl.h @@ -48,6 +48,7 @@ R jsArg( } template +// NOLINTNEXTLINE (T62192316) typename detail::is_dynamic::type &jsArgAsDynamic(T &&args, size_t n) { try { return args[n]; diff --git a/ReactCommon/microprofiler/.clang-tidy b/ReactCommon/microprofiler/.clang-tidy new file mode 100644 index 00000000000..c98fd78ff64 --- /dev/null +++ b/ReactCommon/microprofiler/.clang-tidy @@ -0,0 +1,5 @@ +--- +Checks: '> +clang-diagnostic-*, +' +... diff --git a/ReactCommon/utils/TimeUtils.h b/ReactCommon/utils/TimeUtils.h index b87fc564e75..e4a6c3ec510 100644 --- a/ReactCommon/utils/TimeUtils.h +++ b/ReactCommon/utils/TimeUtils.h @@ -62,13 +62,10 @@ inline static int64_t monotonicTimeInMilliseconds() { #else - It's Unix *without* MONOTONIC_CLOCK support or Microsoft Windows. If you - run this on Microsoft Windows, - could you please implement the function using some Windows - - specific APIs, - and submit a PR - ? https - : // stackoverflow.com/questions/5404277/porting-clock-gettime-to-windows + // It's Unix *without* MONOTONIC_CLOCK support or Microsoft Windows. + // If you run this on Microsoft Windows, could you please implement the + // function using some Windows-specific APIs, and submit a PR? + // https://stackoverflow.com/questions/5404277/porting-clock-gettime-to-windows #endif }