Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c7131ff authored by Vasu Nori's avatar Vasu Nori
Browse files

bring database code in master for 'adb bugreport' in sync with ginger 

Change-Id: Ibe9eb07db363b483a07645e9644d75db51132808
parent 7dda67a8

core/java/android/app/ActivityThread.java

+12 −8
Original line number Diff line number Diff line
@@ -370,7 +370,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 = "  %4d %6d %8d %14s  %s";

        private static final String TWO_COUNT_COLUMNS_DB = "%20s %8d %20s %8d";

        private static final String DB_INFO_FORMAT = "  %8s %8s %14s %14s  %s";



        // Formatting for checkin service - update version if row format changes

        private static final int ACTIVITY_THREAD_CHECKIN_VERSION = 1;
@@ -820,20 +821,23 @@ 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, "  %4s %6s %8s %14s  %s", "pgsz", "dbsz", "lkaside", "cache",

                printRow(pw, "  %8s %8s %14s %14s  %s", "pgsz", "dbsz", "Lookaside(b)", "cache",

                        "Dbname");

                for (int i = 0; i < N; i++) {

                    DbStats dbStats = stats.dbStats.get(i);

                    printRow(pw, DB_INFO_FORMAT, dbStats.pageSize, dbStats.dbSize,

                            dbStats.lookaside, dbStats.cache, dbStats.dbName);

                    printRow(pw, DB_INFO_FORMAT,

                            (dbStats.pageSize > 0) ? String.valueOf(dbStats.pageSize) : " ",

                            (dbStats.dbSize > 0) ? String.valueOf(dbStats.dbSize) : " ",

                            (dbStats.lookaside > 0) ? String.valueOf(dbStats.lookaside) : " ",

                            dbStats.cache, dbStats.dbName);

                }

            }