diff options
Diffstat (limited to 'native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp')
| -rw-r--r-- | native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp | 198 |
1 files changed, 135 insertions, 63 deletions
diff --git a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp index bf7ec0d1a..25580f4b1 100644 --- a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp +++ b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp @@ -15,13 +15,23 @@ ** limitations under the License. */ -#include <stdio.h> -#include <assert.h> -#include <unistd.h> -#include <fcntl.h> +#define LOG_TAG "LatinIME: jni" -#include <jni.h> #include "dictionary.h" +#include "jni.h" + +#include <assert.h> +#include <errno.h> +#include <stdio.h> + +#ifdef USE_MMAP_FOR_DICTIONARY +#include <sys/mman.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#else // USE_MMAP_FOR_DICTIONARY +#include <stdlib.h> +#endif // USE_MMAP_FOR_DICTIONARY // ---------------------------------------------------------------------------- @@ -30,8 +40,7 @@ using namespace latinime; // // helper function to throw an exception // -static void throwException(JNIEnv *env, const char* ex, const char* fmt, int data) -{ +static void throwException(JNIEnv *env, const char* ex, const char* fmt, int data) { if (jclass cls = env->FindClass(ex)) { char msg[1000]; sprintf(msg, fmt, data); @@ -40,26 +49,84 @@ static void throwException(JNIEnv *env, const char* ex, const char* fmt, int dat } } -static jint latinime_BinaryDictionary_open - (JNIEnv *env, jobject object, jobject dictDirectBuffer, - jint typedLetterMultiplier, jint fullWordMultiplier) -{ - void *dict = env->GetDirectBufferAddress(dictDirectBuffer); - if (dict == NULL) { - fprintf(stderr, "DICT: Dictionary buffer is null\n"); +static jint latinime_BinaryDictionary_open(JNIEnv *env, jobject object, + jstring sourceDir, jlong dictOffset, jlong dictSize, + jint typedLetterMultiplier, jint fullWordMultiplier, jint maxWordLength, jint maxWords, + jint maxAlternatives) { + PROF_OPEN; + PROF_START(66); + const char *sourceDirChars = env->GetStringUTFChars(sourceDir, NULL); + if (sourceDirChars == NULL) { + LOGE("DICT: Can't get sourceDir string"); + return 0; + } + int fd = 0; + void *dictBuf = NULL; + int adjust = 0; +#ifdef USE_MMAP_FOR_DICTIONARY + /* mmap version */ + fd = open(sourceDirChars, O_RDONLY); + if (fd < 0) { + LOGE("DICT: Can't open sourceDir. sourceDirChars=%s errno=%d", sourceDirChars, errno); + return 0; + } + int pagesize = getpagesize(); + adjust = dictOffset % pagesize; + int adjDictOffset = dictOffset - adjust; + int adjDictSize = dictSize + adjust; + dictBuf = mmap(NULL, sizeof(char) * adjDictSize, PROT_READ, MAP_PRIVATE, fd, adjDictOffset); + if (dictBuf == MAP_FAILED) { + LOGE("DICT: Can't mmap dictionary. errno=%d", errno); + return 0; + } + dictBuf = (void *)((char *)dictBuf + adjust); +#else // USE_MMAP_FOR_DICTIONARY + /* malloc version */ + FILE *file = NULL; + file = fopen(sourceDirChars, "rb"); + if (file == NULL) { + LOGE("DICT: Can't fopen sourceDir. sourceDirChars=%s errno=%d", sourceDirChars, errno); + return 0; + } + dictBuf = malloc(sizeof(char) * dictSize); + if (!dictBuf) { + LOGE("DICT: Can't allocate memory region for dictionary. errno=%d", errno); + return 0; + } + int ret = fseek(file, (long)dictOffset, SEEK_SET); + if (ret != 0) { + LOGE("DICT: Failure in fseek. ret=%d errno=%d", ret, errno); + return 0; + } + ret = fread(dictBuf, sizeof(char) * dictSize, 1, file); + if (ret != 1) { + LOGE("DICT: Failure in fread. ret=%d errno=%d", ret, errno); + return 0; + } + ret = fclose(file); + if (ret != 0) { + LOGE("DICT: Failure in fclose. ret=%d errno=%d", ret, errno); + return 0; + } +#endif // USE_MMAP_FOR_DICTIONARY + env->ReleaseStringUTFChars(sourceDir, sourceDirChars); + + if (!dictBuf) { + LOGE("DICT: dictBuf is null"); return 0; } - Dictionary *dictionary = new Dictionary(dict, typedLetterMultiplier, fullWordMultiplier); - return (jint) dictionary; + Dictionary *dictionary = new Dictionary(dictBuf, dictSize, fd, adjust, typedLetterMultiplier, + fullWordMultiplier, maxWordLength, maxWords, maxAlternatives); + PROF_END(66); + PROF_CLOSE; + return (jint)dictionary; } -static int latinime_BinaryDictionary_getSuggestions( - JNIEnv *env, jobject object, jint dict, jintArray inputArray, jint arraySize, - jcharArray outputArray, jintArray frequencyArray, jint maxWordLength, jint maxWords, - jint maxAlternatives, jint skipPos, jintArray nextLettersArray, jint nextLettersSize) -{ - Dictionary *dictionary = (Dictionary*) dict; - if (dictionary == NULL) return 0; +static int latinime_BinaryDictionary_getSuggestions(JNIEnv *env, jobject object, jint dict, + jintArray inputArray, jint arraySize, jcharArray outputArray, jintArray frequencyArray, + jintArray nextLettersArray, jint nextLettersSize) { + Dictionary *dictionary = (Dictionary*)dict; + if (!dictionary) return 0; int *frequencies = env->GetIntArrayElements(frequencyArray, NULL); int *inputCodes = env->GetIntArrayElements(inputArray, NULL); @@ -68,8 +135,7 @@ static int latinime_BinaryDictionary_getSuggestions( : NULL; int count = dictionary->getSuggestions(inputCodes, arraySize, (unsigned short*) outputChars, - frequencies, maxWordLength, maxWords, maxAlternatives, skipPos, nextLetters, - nextLettersSize); + frequencies, nextLetters, nextLettersSize); env->ReleaseIntArrayElements(frequencyArray, frequencies, 0); env->ReleaseIntArrayElements(inputArray, inputCodes, JNI_ABORT); @@ -81,13 +147,12 @@ static int latinime_BinaryDictionary_getSuggestions( return count; } -static int latinime_BinaryDictionary_getBigrams - (JNIEnv *env, jobject object, jint dict, jcharArray prevWordArray, jint prevWordLength, - jintArray inputArray, jint inputArraySize, jcharArray outputArray, - jintArray frequencyArray, jint maxWordLength, jint maxBigrams, jint maxAlternatives) -{ - Dictionary *dictionary = (Dictionary*) dict; - if (dictionary == NULL) return 0; +static int latinime_BinaryDictionary_getBigrams(JNIEnv *env, jobject object, jint dict, + jcharArray prevWordArray, jint prevWordLength, jintArray inputArray, jint inputArraySize, + jcharArray outputArray, jintArray frequencyArray, jint maxWordLength, jint maxBigrams, + jint maxAlternatives) { + Dictionary *dictionary = (Dictionary*)dict; + if (!dictionary) return 0; jchar *prevWord = env->GetCharArrayElements(prevWordArray, NULL); int *inputCodes = env->GetIntArrayElements(inputArray, NULL); @@ -106,12 +171,10 @@ static int latinime_BinaryDictionary_getBigrams return count; } - -static jboolean latinime_BinaryDictionary_isValidWord - (JNIEnv *env, jobject object, jint dict, jcharArray wordArray, jint wordLength) -{ - Dictionary *dictionary = (Dictionary*) dict; - if (dictionary == NULL) return (jboolean) false; +static jboolean latinime_BinaryDictionary_isValidWord(JNIEnv *env, jobject object, jint dict, + jcharArray wordArray, jint wordLength) { + Dictionary *dictionary = (Dictionary*)dict; + if (!dictionary) return (jboolean) false; jchar *word = env->GetCharArrayElements(wordArray, NULL); jboolean result = dictionary->isValidWord((unsigned short*) word, wordLength); @@ -120,66 +183,75 @@ static jboolean latinime_BinaryDictionary_isValidWord return result; } -static void latinime_BinaryDictionary_close - (JNIEnv *env, jobject object, jint dict) -{ - Dictionary *dictionary = (Dictionary*) dict; - delete (Dictionary*) dict; +static void latinime_BinaryDictionary_close(JNIEnv *env, jobject object, jint dict) { + Dictionary *dictionary = (Dictionary*)dict; + if (!dictionary) return; + void *dictBuf = dictionary->getDict(); + if (!dictBuf) return; +#ifdef USE_MMAP_FOR_DICTIONARY + int ret = munmap((void *)((char *)dictBuf - dictionary->getDictBufAdjust()), + dictionary->getDictSize() + dictionary->getDictBufAdjust()); + if (ret != 0) { + LOGE("DICT: Failure in munmap. ret=%d errno=%d", ret, errno); + } + ret = close(dictionary->getMmapFd()); + if (ret != 0) { + LOGE("DICT: Failure in close. ret=%d errno=%d", ret, errno); + } +#else // USE_MMAP_FOR_DICTIONARY + free(dictBuf); +#endif // USE_MMAP_FOR_DICTIONARY + delete dictionary; } // ---------------------------------------------------------------------------- static JNINativeMethod gMethods[] = { - {"openNative", "(Ljava/nio/ByteBuffer;II)I", - (void*)latinime_BinaryDictionary_open}, - {"closeNative", "(I)V", (void*)latinime_BinaryDictionary_close}, - {"getSuggestionsNative", "(I[II[C[IIIII[II)I", (void*)latinime_BinaryDictionary_getSuggestions}, - {"isValidWordNative", "(I[CI)Z", (void*)latinime_BinaryDictionary_isValidWord}, - {"getBigramsNative", "(I[CI[II[C[IIII)I", (void*)latinime_BinaryDictionary_getBigrams} + {"openNative", "(Ljava/lang/String;JJIIIII)I", (void*)latinime_BinaryDictionary_open}, + {"closeNative", "(I)V", (void*)latinime_BinaryDictionary_close}, + {"getSuggestionsNative", "(I[II[C[I[II)I", (void*)latinime_BinaryDictionary_getSuggestions}, + {"isValidWordNative", "(I[CI)Z", (void*)latinime_BinaryDictionary_isValidWord}, + {"getBigramsNative", "(I[CI[II[C[IIII)I", (void*)latinime_BinaryDictionary_getBigrams} }; -static int registerNativeMethods(JNIEnv* env, const char* className, - JNINativeMethod* gMethods, int numMethods) -{ +static int registerNativeMethods(JNIEnv* env, const char* className, JNINativeMethod* gMethods, + int numMethods) { jclass clazz; clazz = env->FindClass(className); if (clazz == NULL) { - fprintf(stderr, - "Native registration unable to find class '%s'\n", className); + LOGE("Native registration unable to find class '%s'", className); return JNI_FALSE; } if (env->RegisterNatives(clazz, gMethods, numMethods) < 0) { - fprintf(stderr, "RegisterNatives failed for '%s'\n", className); + LOGE("RegisterNatives failed for '%s'", className); return JNI_FALSE; } return JNI_TRUE; } -static int registerNatives(JNIEnv *env) -{ +static int registerNatives(JNIEnv *env) { const char* const kClassPathName = "com/android/inputmethod/latin/BinaryDictionary"; - return registerNativeMethods(env, - kClassPathName, gMethods, sizeof(gMethods) / sizeof(gMethods[0])); + return registerNativeMethods(env, kClassPathName, gMethods, + sizeof(gMethods) / sizeof(gMethods[0])); } /* * Returns the JNI version on success, -1 on failure. */ -jint JNI_OnLoad(JavaVM* vm, void* reserved) -{ +jint JNI_OnLoad(JavaVM* vm, void* reserved) { JNIEnv* env = NULL; jint result = -1; if (vm->GetEnv((void**) &env, JNI_VERSION_1_4) != JNI_OK) { - fprintf(stderr, "ERROR: GetEnv failed\n"); + LOGE("ERROR: GetEnv failed"); goto bail; } assert(env != NULL); if (!registerNatives(env)) { - fprintf(stderr, "ERROR: BinaryDictionary native registration failed\n"); + LOGE("ERROR: BinaryDictionary native registration failed"); goto bail; } |