nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am d00e4865: am 126d758c: Merge "Quit blocking getSuggestion during GC." 

* commit 'd00e48656b02ff49fc834ed6762dc194d00b42ad':
  Quit blocking getSuggestion during GC.
main
Keisuke Kuroyanagi 2013-10-09 17:53:34 -07:00 committed by Android Git Automerger
parent 645d992786 d00e48656b
commit 07fe099765
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java/src/com/android/inputmethod/latin/BinaryDictionary.java
View File

@ -270,18 +270,11 @@ public final class BinaryDictionary extends Dictionary {
return getBigramProbabilityNative(mNativeDict, codePoints0, codePoints1); return getBigramProbabilityNative(mNativeDict, codePoints0, codePoints1);
} }
private void runGCIfRequired() {
if (needsToRunGC(true /* mindsBlockByGC */)) {
flushWithGC();
}
}
// Add a unigram entry to binary dictionary in native code. // Add a unigram entry to binary dictionary in native code.
public void addUnigramWord(final String word, final int probability) { public void addUnigramWord(final String word, final int probability) {
if (TextUtils.isEmpty(word)) { if (TextUtils.isEmpty(word)) {
return; return;
} }
runGCIfRequired();
final int[] codePoints = StringUtils.toCodePointArray(word); final int[] codePoints = StringUtils.toCodePointArray(word);
addUnigramWordNative(mNativeDict, codePoints, probability); addUnigramWordNative(mNativeDict, codePoints, probability);
} }
@ -291,7 +284,6 @@ public final class BinaryDictionary extends Dictionary {
if (TextUtils.isEmpty(word0) || TextUtils.isEmpty(word1)) { if (TextUtils.isEmpty(word0) || TextUtils.isEmpty(word1)) {
return; return;
} }
runGCIfRequired();
final int[] codePoints0 = StringUtils.toCodePointArray(word0); final int[] codePoints0 = StringUtils.toCodePointArray(word0);
final int[] codePoints1 = StringUtils.toCodePointArray(word1); final int[] codePoints1 = StringUtils.toCodePointArray(word1);
addBigramWordsNative(mNativeDict, codePoints0, codePoints1, probability); addBigramWordsNative(mNativeDict, codePoints0, codePoints1, probability);
@ -302,7 +294,6 @@ public final class BinaryDictionary extends Dictionary {
if (TextUtils.isEmpty(word0) || TextUtils.isEmpty(word1)) { if (TextUtils.isEmpty(word0) || TextUtils.isEmpty(word1)) {
return; return;
} }
runGCIfRequired();
final int[] codePoints0 = StringUtils.toCodePointArray(word0); final int[] codePoints0 = StringUtils.toCodePointArray(word0);
final int[] codePoints1 = StringUtils.toCodePointArray(word1); final int[] codePoints1 = StringUtils.toCodePointArray(word1);
removeBigramWordsNative(mNativeDict, codePoints0, codePoints1); removeBigramWordsNative(mNativeDict, codePoints0, codePoints1);

24
java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
View File

@ -273,6 +273,24 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
lastModifiedTime); lastModifiedTime);
} }
private void runGCIfRequired() {
if (!ENABLE_BINARY_DICTIONARY_DYNAMIC_UPDATE) return;
if (mBinaryDictionary.needsToRunGC(true /* mindsBlockByGC */)) {
if (setIsRegeneratingIfNotRegenerating()) {
getExecutor(mFilename).execute(new Runnable() {
@Override
public void run() {
try {
mBinaryDictionary.flushWithGC();
} finally {
mFilenameDictionaryUpdateController.mIsRegenerating.set(false);
}
}
});
}
}
}
/** /**
* Dynamically adds a word unigram to the dictionary. May overwrite an existing entry. * Dynamically adds a word unigram to the dictionary. May overwrite an existing entry.
*/ */
@ -282,7 +300,7 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
Log.w(TAG, "addWordDynamically is called for non-updatable dictionary: " + mFilename); Log.w(TAG, "addWordDynamically is called for non-updatable dictionary: " + mFilename);
return; return;
} }
runGCIfRequired();
getExecutor(mFilename).execute(new Runnable() { getExecutor(mFilename).execute(new Runnable() {
@Override @Override
public void run() { public void run() {
@ -306,7 +324,7 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
+ mFilename); + mFilename);
return; return;
} }
runGCIfRequired();
getExecutor(mFilename).execute(new Runnable() { getExecutor(mFilename).execute(new Runnable() {
@Override @Override
public void run() { public void run() {
@ -330,7 +348,7 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
+ mFilename); + mFilename);
return; return;
} }
runGCIfRequired();
getExecutor(mFilename).execute(new Runnable() { getExecutor(mFilename).execute(new Runnable() {
@Override @Override
public void run() { public void run() {