Use wall time instead of CPU time for performance log
Apparently what currentThreadTimeMillis() returns is the CPU time,
not wall time, which is not really interesting when we measure
performance. Use the actual wall time instead.
Change-Id: Ibe2e385ff1bdeeb1128a584c79925210dde5525a
diff --git a/src/com/android/providers/contacts/ContactDirectoryManager.java b/src/com/android/providers/contacts/ContactDirectoryManager.java
index 500052f..7116ed6 100644
--- a/src/com/android/providers/contacts/ContactDirectoryManager.java
+++ b/src/com/android/providers/contacts/ContactDirectoryManager.java
@@ -187,10 +187,10 @@
return;
}
- long start = SystemClock.currentThreadTimeMillis();
+ final long start = SystemClock.elapsedRealtime();
int count = scanAllPackages();
getDbHelper().setProperty(DbProperties.DIRECTORY_SCAN_COMPLETE, "1");
- long end = SystemClock.currentThreadTimeMillis();
+ final long end = SystemClock.elapsedRealtime();
Log.i(TAG, "Discovered " + count + " contact directories in " + (end - start) + "ms");
// Announce the change to listeners of the contacts authority
diff --git a/src/com/android/providers/contacts/ContactsDatabaseHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
index 256abd4..32928ba 100644
--- a/src/com/android/providers/contacts/ContactsDatabaseHelper.java
+++ b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
@@ -2977,7 +2977,7 @@
public void setLocale(ContactsProvider2 provider, Locale locale) {
Log.i(TAG, "Switching to locale " + locale);
- long start = SystemClock.uptimeMillis();
+ final long start = SystemClock.elapsedRealtime();
SQLiteDatabase db = getWritableDatabase();
db.setLocale(locale);
db.beginTransaction();
@@ -2995,7 +2995,7 @@
db.endTransaction();
}
- Log.i(TAG, "Locale change completed in " + (SystemClock.uptimeMillis() - start) + "ms");
+ Log.i(TAG, "Locale change completed in " + (SystemClock.elapsedRealtime() - start) + "ms");
}
/**
diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index a2e4c7f..6de16df 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -7917,7 +7917,7 @@
protected void upgradeAggregationAlgorithmInBackground() {
Log.i(TAG, "Upgrading aggregation algorithm");
int count = 0;
- long start = SystemClock.currentThreadTimeMillis();
+ final long start = SystemClock.elapsedRealtime();
SQLiteDatabase db = null;
try {
switchToContactMode();
@@ -7951,7 +7951,7 @@
if (db != null) {
db.endTransaction();
}
- long end = SystemClock.currentThreadTimeMillis();
+ final long end = SystemClock.elapsedRealtime();
Log.i(TAG, "Aggregation algorithm upgraded for " + count
+ " contacts, in " + (end - start) + "ms");
}
diff --git a/src/com/android/providers/contacts/SearchIndexManager.java b/src/com/android/providers/contacts/SearchIndexManager.java
index 2174f69..f1b7338 100644
--- a/src/com/android/providers/contacts/SearchIndexManager.java
+++ b/src/com/android/providers/contacts/SearchIndexManager.java
@@ -238,7 +238,7 @@
private void rebuildIndex(SQLiteDatabase db) {
mContactsProvider.setProviderStatus(ProviderStatus.STATUS_UPGRADING);
- long start = SystemClock.currentThreadTimeMillis();
+ final long start = SystemClock.elapsedRealtime();
int count = 0;
try {
mDbHelper.createSearchIndexTable(db);
@@ -246,7 +246,7 @@
} finally {
mContactsProvider.setProviderStatus(ProviderStatus.STATUS_NORMAL);
- long end = SystemClock.currentThreadTimeMillis();
+ final long end = SystemClock.elapsedRealtime();
Log.i(TAG, "Rebuild contact search index in " + (end - start) + "ms, "
+ count + " contacts");
}