diff --git a/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp b/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp index e312aeabc..f88d37ec9 100644 --- a/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp +++ b/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp @@ -43,13 +43,17 @@ static void latinime_Keyboard_release(JNIEnv *env, jclass clazz, jlong proximity delete pi; } -static JNINativeMethod sMethods[] = { - {const_cast("setProximityInfoNative"), - const_cast("(Ljava/lang/String;IIIIII[II[I[I[I[I[I[F[F[F)J"), - reinterpret_cast(latinime_Keyboard_setProximityInfo)}, - {const_cast("releaseProximityInfoNative"), - const_cast("(J)V"), - reinterpret_cast(latinime_Keyboard_release)} +static const JNINativeMethod sMethods[] = { + { + const_cast("setProximityInfoNative"), + const_cast("(Ljava/lang/String;IIIIII[II[I[I[I[I[I[F[F[F)J"), + reinterpret_cast(latinime_Keyboard_setProximityInfo) + }, + { + const_cast("releaseProximityInfoNative"), + const_cast("(J)V"), + reinterpret_cast(latinime_Keyboard_release) + } }; int register_ProximityInfo(JNIEnv *env) { diff --git a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp index 34764c337..f60793733 100644 --- a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp +++ b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp @@ -14,23 +14,16 @@ * limitations under the License. */ -#include // for memset() - #define LOG_TAG "LatinIME: jni: BinaryDictionary" -#include "defines.h" // for macros below - -#ifdef USE_MMAP_FOR_DICTIONARY -#include -#include -#include -#else // USE_MMAP_FOR_DICTIONARY -#include -#include // for fopen() etc. -#endif // USE_MMAP_FOR_DICTIONARY - #include "com_android_inputmethod_latin_BinaryDictionary.h" +#include +#include // for memset() +#include +#include + +#include "defines.h" #include "jni.h" #include "jni_common.h" #include "obsolete/correction.h" @@ -60,8 +53,6 @@ static jlong latinime_BinaryDictionary_open(JNIEnv *env, jclass clazz, jstring s int fd = 0; void *dictBuf = 0; int adjust = 0; -#ifdef USE_MMAP_FOR_DICTIONARY - /* mmap version */ fd = open(sourceDirChars, O_RDONLY); if (fd < 0) { AKLOGE("DICT: Can't open sourceDir. sourceDirChars=%s errno=%d", sourceDirChars, errno); @@ -77,35 +68,6 @@ static jlong latinime_BinaryDictionary_open(JNIEnv *env, jclass clazz, jstring s return 0; } dictBuf = static_cast(dictBuf) + adjust; -#else // USE_MMAP_FOR_DICTIONARY - /* malloc version */ - FILE *file = 0; - file = fopen(sourceDirChars, "rb"); - if (file == 0) { - AKLOGE("DICT: Can't fopen sourceDir. sourceDirChars=%s errno=%d", sourceDirChars, errno); - return 0; - } - dictBuf = malloc(dictSize); - if (!dictBuf) { - AKLOGE("DICT: Can't allocate memory region for dictionary. errno=%d", errno); - return 0; - } - int ret = fseek(file, static_cast(dictOffset), SEEK_SET); - if (ret != 0) { - AKLOGE("DICT: Failure in fseek. ret=%d errno=%d", ret, errno); - return 0; - } - ret = fread(dictBuf, dictSize, 1, file); - if (ret != 1) { - AKLOGE("DICT: Failure in fread. ret=%d errno=%d", ret, errno); - return 0; - } - ret = fclose(file); - if (ret != 0) { - AKLOGE("DICT: Failure in fclose. ret=%d errno=%d", ret, errno); - return 0; - } -#endif // USE_MMAP_FOR_DICTIONARY if (!dictBuf) { AKLOGE("DICT: dictBuf is null"); return 0; @@ -115,11 +77,7 @@ static jlong latinime_BinaryDictionary_open(JNIEnv *env, jclass clazz, jstring s == BinaryDictionaryFormat::detectFormatVersion(static_cast(dictBuf), static_cast(dictSize))) { AKLOGE("DICT: dictionary format is unknown, bad magic number"); -#ifdef USE_MMAP_FOR_DICTIONARY releaseDictBuf(static_cast(dictBuf) - adjust, adjDictSize, fd); -#else // USE_MMAP_FOR_DICTIONARY - releaseDictBuf(dictBuf, 0, 0); -#endif // USE_MMAP_FOR_DICTIONARY } else { dictionary = new Dictionary(dictBuf, static_cast(dictSize), fd, adjust); } @@ -264,17 +222,12 @@ static void latinime_BinaryDictionary_close(JNIEnv *env, jclass clazz, jlong dic if (!dictionary) return; const void *dictBuf = dictionary->getBinaryDictionaryInfo()->getDictBuf(); if (!dictBuf) return; -#ifdef USE_MMAP_FOR_DICTIONARY releaseDictBuf(static_cast(dictBuf) - dictionary->getDictBufAdjust(), dictionary->getDictSize() + dictionary->getDictBufAdjust(), dictionary->getMmapFd()); -#else // USE_MMAP_FOR_DICTIONARY - releaseDictBuf(dictBuf, 0, 0); -#endif // USE_MMAP_FOR_DICTIONARY delete dictionary; } static void releaseDictBuf(const void *dictBuf, const size_t length, const int fd) { -#ifdef USE_MMAP_FOR_DICTIONARY int ret = munmap(const_cast(dictBuf), length); if (ret != 0) { AKLOGE("DICT: Failure in munmap. ret=%d errno=%d", ret, errno); @@ -283,33 +236,44 @@ static void releaseDictBuf(const void *dictBuf, const size_t length, const int f if (ret != 0) { AKLOGE("DICT: Failure in close. ret=%d errno=%d", ret, errno); } -#else // USE_MMAP_FOR_DICTIONARY - free(const_cast(dictBuf)); -#endif // USE_MMAP_FOR_DICTIONARY } -static JNINativeMethod sMethods[] = { - {const_cast("openNative"), - const_cast("(Ljava/lang/String;JJ)J"), - reinterpret_cast(latinime_BinaryDictionary_open)}, - {const_cast("closeNative"), - const_cast("(J)V"), - reinterpret_cast(latinime_BinaryDictionary_close)}, - {const_cast("getSuggestionsNative"), - const_cast("(JJJ[I[I[I[I[III[I[I[I[I[I[I)I"), - reinterpret_cast(latinime_BinaryDictionary_getSuggestions)}, - {const_cast("getProbabilityNative"), - const_cast("(J[I)I"), - reinterpret_cast(latinime_BinaryDictionary_getProbability)}, - {const_cast("isValidBigramNative"), - const_cast("(J[I[I)Z"), - reinterpret_cast(latinime_BinaryDictionary_isValidBigram)}, - {const_cast("calcNormalizedScoreNative"), - const_cast("([I[II)F"), - reinterpret_cast(latinime_BinaryDictionary_calcNormalizedScore)}, - {const_cast("editDistanceNative"), - const_cast("([I[I)I"), - reinterpret_cast(latinime_BinaryDictionary_editDistance)} +static const JNINativeMethod sMethods[] = { + { + const_cast("openNative"), + const_cast("(Ljava/lang/String;JJ)J"), + reinterpret_cast(latinime_BinaryDictionary_open) + }, + { + const_cast("closeNative"), + const_cast("(J)V"), + reinterpret_cast(latinime_BinaryDictionary_close) + }, + { + const_cast("getSuggestionsNative"), + const_cast("(JJJ[I[I[I[I[III[I[I[I[I[I[I)I"), + reinterpret_cast(latinime_BinaryDictionary_getSuggestions) + }, + { + const_cast("getProbabilityNative"), + const_cast("(J[I)I"), + reinterpret_cast(latinime_BinaryDictionary_getProbability) + }, + { + const_cast("isValidBigramNative"), + const_cast("(J[I[I)Z"), + reinterpret_cast(latinime_BinaryDictionary_isValidBigram) + }, + { + const_cast("calcNormalizedScoreNative"), + const_cast("([I[II)F"), + reinterpret_cast(latinime_BinaryDictionary_calcNormalizedScore) + }, + { + const_cast("editDistanceNative"), + const_cast("([I[I)I"), + reinterpret_cast(latinime_BinaryDictionary_editDistance) + } }; int register_BinaryDictionary(JNIEnv *env) { diff --git a/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp b/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp index d4541507b..72e625836 100644 --- a/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp +++ b/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp @@ -50,16 +50,22 @@ static void latinime_releaseDicTraverseSession(JNIEnv *env, jclass clazz, jlong DicTraverseSession::releaseSessionInstance(ts); } -static JNINativeMethod sMethods[] = { - {const_cast("setDicTraverseSessionNative"), - const_cast("(Ljava/lang/String;)J"), - reinterpret_cast(latinime_setDicTraverseSession)}, - {const_cast("initDicTraverseSessionNative"), - const_cast("(JJ[II)V"), - reinterpret_cast(latinime_initDicTraverseSession)}, - {const_cast("releaseDicTraverseSessionNative"), - const_cast("(J)V"), - reinterpret_cast(latinime_releaseDicTraverseSession)} +static const JNINativeMethod sMethods[] = { + { + const_cast("setDicTraverseSessionNative"), + const_cast("(Ljava/lang/String;)J"), + reinterpret_cast(latinime_setDicTraverseSession) + }, + { + const_cast("initDicTraverseSessionNative"), + const_cast("(JJ[II)V"), + reinterpret_cast(latinime_initDicTraverseSession) + }, + { + const_cast("releaseDicTraverseSessionNative"), + const_cast("(J)V"), + reinterpret_cast(latinime_releaseDicTraverseSession) + } }; int register_DicTraverseSession(JNIEnv *env) { diff --git a/native/jni/jni_common.cpp b/native/jni/jni_common.cpp index 8e5c50880..f2867d7c3 100644 --- a/native/jni/jni_common.cpp +++ b/native/jni/jni_common.cpp @@ -55,8 +55,8 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) { } namespace latinime { -int registerNativeMethods(JNIEnv *env, const char *className, JNINativeMethod *methods, - int numMethods) { +int registerNativeMethods(JNIEnv *env, const char *const className, const JNINativeMethod *methods, + const int numMethods) { jclass clazz = env->FindClass(className); if (!clazz) { AKLOGE("Native registration unable to find class '%s'", className); diff --git a/native/jni/jni_common.h b/native/jni/jni_common.h index f960b05a6..ef72a7ce9 100644 --- a/native/jni/jni_common.h +++ b/native/jni/jni_common.h @@ -20,7 +20,7 @@ #include "jni.h" namespace latinime { -int registerNativeMethods(JNIEnv *env, const char *className, JNINativeMethod *methods, - int numMethods); +int registerNativeMethods(JNIEnv *env, const char *const className, const JNINativeMethod *methods, + const int numMethods); } // namespace latinime #endif // LATINIME_JNI_COMMON_H diff --git a/native/jni/src/defines.h b/native/jni/src/defines.h index ab326169d..e0edff584 100644 --- a/native/jni/src/defines.h +++ b/native/jni/src/defines.h @@ -264,11 +264,6 @@ static inline void prof_out(void) { // of the binary dictionary where a {key,value} string pair scheme is used. #define LARGEST_INT_DIGIT_COUNT 11 -// Define this to use mmap() for dictionary loading. Undefine to use malloc() instead of mmap(). -// We measured and compared performance of both, and found mmap() is fairly good in terms of -// loading time, and acceptable even for several initial lookups which involve page faults. -#define USE_MMAP_FOR_DICTIONARY - #define NOT_VALID_WORD (-99) #define NOT_A_CODE_POINT (-1) #define NOT_A_DISTANCE (-1)