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

Merge "Avoid disk writes on UI thread."

main
Ken Wakasa 2010-11-18 12:46:58 -08:00 committed by Android (Google) Code Review
parent 279da1da91 11eb13e04f
commit 95a5daa3e3
1 changed files with 61 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
java/src/com/android/inputmethod/latin/LatinIMEUtil.java
View File

@ -21,6 +21,9 @@ import android.view.inputmethod.InputMethodManager;
import android.content.Context; import android.content.Context;
import android.inputmethodservice.InputMethodService; import android.inputmethodservice.InputMethodService;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.Process;
import android.text.format.DateUtils; import android.text.format.DateUtils;
import android.text.format.Time; import android.text.format.Time;
import android.util.Log; import android.util.Log;
@ -172,7 +175,7 @@ public class LatinIMEUtil {
} }
} }
public String getLastString() { public String getLastString() {
StringBuffer sb = new StringBuffer(); StringBuilder sb = new StringBuilder();
for (int i = 0; i < mLength; ++i) { for (int i = 0; i < mLength; ++i) {
char c = mCharBuf[normalize(mEnd - 1 - i)]; char c = mCharBuf[normalize(mEnd - 1 - i)];
if (!((LatinIME)mContext).isWordSeparator(c)) { if (!((LatinIME)mContext).isWordSeparator(c)) {
@ -247,16 +250,22 @@ public class LatinIMEUtil {
private static final String FILENAME = "log.txt"; private static final String FILENAME = "log.txt";
private static final UsabilityStudyLogUtils sInstance = private static final UsabilityStudyLogUtils sInstance =
new UsabilityStudyLogUtils(); new UsabilityStudyLogUtils();
private final Handler mLoggingHandler;
private File mFile; private File mFile;
private File mDirectory; private File mDirectory;
private InputMethodService mIms; private InputMethodService mIms;
private PrintWriter mWriter; private PrintWriter mWriter;
private Date mDate; private final Date mDate;
private SimpleDateFormat mDateFormat; private final SimpleDateFormat mDateFormat;
private UsabilityStudyLogUtils() { private UsabilityStudyLogUtils() {
mDate = new Date(); mDate = new Date();
mDateFormat = new SimpleDateFormat("dd MMM HH:mm:ss.SSS"); mDateFormat = new SimpleDateFormat("dd MMM HH:mm:ss.SSS");
HandlerThread handlerThread = new HandlerThread("UsabilityStudyLogUtils logging task",
Process.THREAD_PRIORITY_BACKGROUND);
handlerThread.start();
mLoggingHandler = new Handler(handlerThread.getLooper());
} }
public static UsabilityStudyLogUtils getInstance() { public static UsabilityStudyLogUtils getInstance() {
@ -266,7 +275,6 @@ public class LatinIMEUtil {
public void init(InputMethodService ims) { public void init(InputMethodService ims) {
mIms = ims; mIms = ims;
mDirectory = ims.getFilesDir(); mDirectory = ims.getFilesDir();
createLogFileIfNotExist();
} }
private void createLogFileIfNotExist() { private void createLogFileIfNotExist() {
@ -301,51 +309,63 @@ public class LatinIMEUtil {
LatinImeLogger.onPrintAllUsabilityStudtyLogs(); LatinImeLogger.onPrintAllUsabilityStudtyLogs();
} }
public void write(String log) { public void write(final String log) {
createLogFileIfNotExist(); mLoggingHandler.post(new Runnable() {
final long currentTime = System.currentTimeMillis(); public void run() {
mDate.setTime(currentTime); createLogFileIfNotExist();
final long currentTime = System.currentTimeMillis();
mDate.setTime(currentTime);
final String printString = String.format("%s\t%d\t%s\n", mDateFormat.format(mDate), final String printString = String.format("%s\t%d\t%s\n",
currentTime, log); mDateFormat.format(mDate), currentTime, log);
if (LatinImeLogger.sDBG) { if (LatinImeLogger.sDBG) {
Log.d(TAG, "Write: " + log); Log.d(TAG, "Write: " + log);
} }
mWriter.print(printString); mWriter.print(printString);
mWriter.flush(); }
});
} }
public void printAll() { public void printAll() {
StringBuffer sb = new StringBuffer(); mLoggingHandler.post(new Runnable() {
BufferedReader br = getBufferedReader(); public void run() {
String line; mWriter.flush();
try { StringBuilder sb = new StringBuilder();
while ((line = br.readLine()) != null) { BufferedReader br = getBufferedReader();
sb.append('\n'); String line;
sb.append(line); try {
while ((line = br.readLine()) != null) {
sb.append('\n');
sb.append(line);
}
} catch (IOException e) {
Log.e(TAG, "Can't read log file.");
} finally {
if (LatinImeLogger.sDBG) {
Log.d(TAG, "output all logs\n" + sb.toString());
}
mIms.getCurrentInputConnection().commitText(sb.toString(), 0);
try {
br.close();
} catch (IOException e) {
}
}
} }
} catch (IOException e) { });
Log.e(TAG, "Can't read log file.");
} finally {
if (LatinImeLogger.sDBG) {
Log.d(TAG, "output all logs\n" + sb.toString());
}
mIms.getCurrentInputConnection().commitText(sb.toString(), 0);
try {
br.close();
} catch (IOException e) {
}
}
} }
public void clearAll() { public void clearAll() {
if (mFile != null && mFile.exists()) { mLoggingHandler.post(new Runnable() {
if (LatinImeLogger.sDBG) { public void run() {
Log.d(TAG, "Delete log file."); if (mFile != null && mFile.exists()) {
if (LatinImeLogger.sDBG) {
Log.d(TAG, "Delete log file.");
}
mFile.delete();
mWriter.close();
}
} }
mFile.delete(); });
mWriter.close();
}
} }
private BufferedReader getBufferedReader() { private BufferedReader getBufferedReader() {
@ -365,7 +385,7 @@ public class LatinIMEUtil {
mFile.delete(); mFile.delete();
} }
} }
return new PrintWriter(new FileOutputStream(mFile)); return new PrintWriter(new FileOutputStream(mFile), true /* autoFlush */);
} }
} }
} }