diff options
| author | Vasu Nori <vnori@google.com> | 2010-09-21 12:25:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-21 12:25:39 -0700 |
| commit | b745ec954272a3c09cca354ad84e2e08b54c8544 (patch) | |
| tree | 23b1d6ccf56f40e7a302f127588ac67197d031c8 /core/java/android | |
| parent | 100cc263b465242c01dc9eb280d77ffaadbddd39 (diff) | |
| parent | 173ea0912af296c6e80d14b764046534b316d21f (diff) | |
| download | frameworks_base-b745ec954272a3c09cca354ad84e2e08b54c8544.zip frameworks_base-b745ec954272a3c09cca354ad84e2e08b54c8544.tar.gz frameworks_base-b745ec954272a3c09cca354ad84e2e08b54c8544.tar.bz2 | |
am 173ea091: Merge "DO NOT MERGE - use appropriate names on SQL numbers in \'adb bugreport\'" into gingerbread
Merge commit '173ea0912af296c6e80d14b764046534b316d21f' into gingerbread-plus-aosp
* commit '173ea0912af296c6e80d14b764046534b316d21f':
DO NOT MERGE - use appropriate names on SQL numbers in 'adb bugreport'
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 11 | ||||
| -rw-r--r-- | core/java/android/database/sqlite/SQLiteDebug.java | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index d8b5253..3c7bebf 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -363,7 +363,8 @@ public final class ActivityThread { private static final String HEAP_COLUMN = "%17s %8s %8s %8s %8s"; private static final String ONE_COUNT_COLUMN = "%17s %8d"; private static final String TWO_COUNT_COLUMNS = "%17s %8d %17s %8d"; - private static final String DB_INFO_FORMAT = " %8d %8d %10d %s"; + private static final String TWO_COUNT_COLUMNS_DB = "%20s %8d %20s %8d"; + private static final String DB_INFO_FORMAT = " %8d %8d %14d %s"; // Formatting for checkin service - update version if row format changes private static final int ACTIVITY_THREAD_CHECKIN_VERSION = 1; @@ -806,15 +807,15 @@ public final class ActivityThread { // SQLite mem info pw.println(" "); pw.println(" SQL"); - printRow(pw, TWO_COUNT_COLUMNS, "heap:", sqliteAllocated, "memoryUsed:", + printRow(pw, TWO_COUNT_COLUMNS_DB, "heap:", sqliteAllocated, "MEMORY_USED:", stats.memoryUsed / 1024); - printRow(pw, TWO_COUNT_COLUMNS, "pageCacheOverflo:", stats.pageCacheOverflo / 1024, - "largestMemAlloc:", stats.largestMemAlloc / 1024); + printRow(pw, TWO_COUNT_COLUMNS_DB, "PAGECACHE_OVERFLOW:", + stats.pageCacheOverflo / 1024, "MALLOC_SIZE:", stats.largestMemAlloc / 1024); pw.println(" "); int N = stats.dbStats.size(); if (N > 0) { pw.println(" DATABASES"); - printRow(pw, " %8s %8s %10s %s", "Pagesize", "Dbsize", "Lookaside", "Dbname"); + printRow(pw, " %8s %8s %14s %s", "pgsz", "dbsz", "Lookaside(b)", "Dbname"); for (int i = 0; i < N; i++) { DbStats dbStats = stats.dbStats.get(i); printRow(pw, DB_INFO_FORMAT, dbStats.pageSize, dbStats.dbSize, diff --git a/core/java/android/database/sqlite/SQLiteDebug.java b/core/java/android/database/sqlite/SQLiteDebug.java index 89c3f96..b2a166b 100644 --- a/core/java/android/database/sqlite/SQLiteDebug.java +++ b/core/java/android/database/sqlite/SQLiteDebug.java @@ -134,7 +134,7 @@ public final class SQLiteDebug { public DbStats(String dbName, long pageCount, long pageSize, int lookaside) { this.dbName = dbName; - this.pageSize = pageSize; + this.pageSize = pageSize / 1024; dbSize = (pageCount * pageSize) / 1024; this.lookaside = lookaside; } |