Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix sqlite time measurement." into nyc-dev

Browse Source 
am: c2c5b23

* commit 'c2c5b230995d8880c74b1cf6043cd43b317efabc':
  Fix sqlite time measurement.

Change-Id: I12afbae0eec6db332aae1b2e5fdf0300a36a8bd8
This commit is contained in:
Makoto Onuki
2016-04-07 18:45:50 +00:00
committed by android-build-merger
parent 0f7426090a c2c5b23099
commit 9a5ca319bc
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/database/sqlite/SQLiteConnection.java
View File

@@ -26,6 +26,7 @@ import android.database.sqlite.SQLiteDebug.DbStats;
import android.os.CancellationSignal;
import android.os.OperationCanceledException;
import android.os.ParcelFileDescriptor;
import android.os.SystemClock;
import android.os.Trace;
import android.util.Log;
import android.util.LruCache;
@@ -1311,7 +1312,8 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen
operation.mBindArgs.clear();
}
}
operation.mStartTime = System.currentTimeMillis();
operation.mStartWallTime = System.currentTimeMillis();
operation.mStartTime = SystemClock.uptimeMillis();
operation.mKind = kind;
operation.mSql = sql;
if (bindArgs != null) {
@@ -1376,7 +1378,7 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen
Trace.asyncTraceEnd(Trace.TRACE_TAG_DATABASE, operation.getTraceMethodName(),
operation.mCookie);
}
operation.mEndTime = System.currentTimeMillis();
operation.mEndTime = SystemClock.uptimeMillis();
operation.mFinished = true;
return SQLiteDebug.DEBUG_LOG_SLOW_QUERIES && SQLiteDebug.shouldLogSlowQuery(
operation.mEndTime - operation.mStartTime);
@@ -1454,8 +1456,9 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen
// marker for us, potentially losing metadata in the process).
private static final int MAX_TRACE_METHOD_NAME_LEN = 256;
public long mStartTime;
public long mEndTime;
public long mStartWallTime; // in System.currentTimeMillis()
public long mStartTime; // in SystemClock.uptimeMillis();
public long mEndTime; // in SystemClock.uptimeMillis();
public String mKind;
public String mSql;
public ArrayList<Object> mBindArgs;
@@ -1468,7 +1471,7 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen
if (mFinished) {
msg.append(" took ").append(mEndTime - mStartTime).append("ms");
} else {
msg.append(" started ").append(System.currentTimeMillis() - mStartTime)
msg.append(" started ").append(System.currentTimeMillis() - mStartWallTime)
.append("ms ago");
}
msg.append(" - ").append(getStatus());
@@ -1519,7 +1522,7 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen
// relatively expensive to create during preloading. This method is only used
// when dumping a connection, which is a rare (mainly error) case. So:
// DO NOT CACHE.
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS").format(new Date(mStartTime));
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS").format(new Date(mStartWallTime));
}
}
}