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

Commit fc3cdb93 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

Merge commit 'afd0debe' into HEAD 

Change-Id: Ic9aed2c57bdfeb250ce2dd7f0e9289ba5b6e936a
parents f2f74ca6 afd0debe

cmds/atrace/atrace.cpp

+4 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ static const TracingCategory k_categories[] = { 
    { "hal",        "Hardware Modules", ATRACE_TAG_HAL, { } },

    { "res",        "Resource Loading", ATRACE_TAG_RESOURCES, { } },

    { "dalvik",     "Dalvik VM",        ATRACE_TAG_DALVIK, { } },

    { "rs",         "RenderScript",     ATRACE_TAG_RS, { } },

    { "sched",      "CPU Scheduling",   0, {

        { REQ,      "/sys/kernel/debug/tracing/events/sched/sched_switch/enable" },

        { REQ,      "/sys/kernel/debug/tracing/events/sched/sched_wakeup/enable" },
@@ -102,6 +103,9 @@ static const TracingCategory k_categories[] = { 
        { REQ,      "/sys/kernel/debug/tracing/events/block/block_rq_issue/enable" },

        { REQ,      "/sys/kernel/debug/tracing/events/block/block_rq_complete/enable" },

    } },

    { "mmc",        "eMMC commands",    0, {

        { REQ,      "/sys/kernel/debug/tracing/events/mmc/enable" },

    } },

    { "load",       "CPU Load",         0, {

        { REQ,      "/sys/kernel/debug/tracing/events/cpufreq_interactive/enable" },

    } },

cmds/dumpstate/Android.mk

+6 −6
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)

LOCAL_SRC_FILES := libdumpstate_default.c

LOCAL_MODULE := libdumpstate.default

include $(BUILD_STATIC_LIBRARY)



include $(CLEAR_VARS)



ifdef BOARD_WLAN_DEVICE
@@ -10,12 +15,7 @@ LOCAL_SRC_FILES := dumpstate.c utils.c 
LOCAL_MODULE := dumpstate



LOCAL_SHARED_LIBRARIES := libcutils liblog libselinux



ifdef BOARD_LIB_DUMPSTATE

LOCAL_STATIC_LIBRARIES := $(BOARD_LIB_DUMPSTATE)

LOCAL_CFLAGS += -DBOARD_HAS_DUMPSTATE

endif



LOCAL_HAL_STATIC_LIBRARIES := libdumpstate

LOCAL_CFLAGS += -Wall -Wno-unused-parameter -std=gnu99



include $(BUILD_EXECUTABLE)

cmds/dumpstate/dumpstate.c

+13 −4
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include "private/android_filesystem_config.h"



#define LOG_TAG "dumpstate"

#include <utils/Log.h>

#include <cutils/log.h>



#include "dumpstate.h"
@@ -95,6 +95,7 @@ static void dumpstate() { 


    run_command("PROCESSES", 10, "ps", "-P", NULL);

    run_command("PROCESSES AND THREADS", 10, "ps", "-t", "-p", "-P", NULL);

    run_command("PROCESSES (SELINUX LABELS)", 10, "ps", "-Z", NULL);

    run_command("LIBRANK", 10, "librank", NULL);



    do_dmesg();
@@ -186,7 +187,7 @@ static void dumpstate() { 
    run_command("IP6TABLE RAW", 10, SU_PATH, "root", "ip6tables", "-t", "raw", "-L", "-nvx", NULL);



    run_command("WIFI NETWORKS", 20,

            SU_PATH, "root", "wpa_cli", "list_networks", NULL);

            SU_PATH, "root", "wpa_cli", "IFNAME=wlan0", "list_networks", NULL);



#ifdef FWDUMP_bcmdhd

    run_command("DUMP WIFI INTERNAL COUNTERS", 20,
@@ -243,14 +244,12 @@ static void dumpstate() { 
    dump_file("BINDER STATS", "/sys/kernel/debug/binder/stats");

    dump_file("BINDER STATE", "/sys/kernel/debug/binder/state");



#ifdef BOARD_HAS_DUMPSTATE

    printf("========================================================\n");

    printf("== Board\n");

    printf("========================================================\n");



    dumpstate_board();

    printf("\n");

#endif



    /* Migrate the ril_dumpstate to a dumpstate_board()? */

    char ril_dumpstate_timeout[PROPERTY_VALUE_MAX] = {0};
@@ -277,6 +276,16 @@ static void dumpstate() { 
       dumpsys itself... */

    run_command("DUMPSYS", 60, "dumpsys", NULL);



    printf("========================================================\n");

    printf("== Checkins\n");

    printf("========================================================\n");



    run_command("CHECKIN BATTERYSTATS", 30, "dumpsys", "batterystats", "-c", NULL);

    run_command("CHECKIN MEMINFO", 30, "dumpsys", "meminfo", "--checkin", NULL);

    run_command("CHECKIN NETSTATS", 30, "dumpsys", "netstats", "--checkin", NULL);

    run_command("CHECKIN PROCSTATS", 30, "dumpsys", "procstats", "-c", NULL);

    run_command("CHECKIN USAGESTATS", 30, "dumpsys", "usagestats", "-c", NULL);



    printf("========================================================\n");

    printf("== Running Application Activities\n");

    printf("========================================================\n");

libs/utils/Flattenable.cpp→cmds/dumpstate/libdumpstate_default.c

+4 −6
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2006 The Android Open Source Project

 * Copyright (C) 2013 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -14,11 +14,9 @@ 
 * limitations under the License.

 */



#include <utils/Flattenable.h>

#include "dumpstate.h"



namespace android {



Flattenable::~Flattenable() {

void dumpstate_board(void)

{

}

}; // namespace android

cmds/dumpsys/dumpsys.cpp

+10 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include <binder/Parcel.h>

#include <binder/ProcessState.h>

#include <binder/IServiceManager.h>

#include <utils/TextOutput.h>

#include <binder/TextOutput.h>

#include <utils/Vector.h>



#include <getopt.h>
@@ -39,7 +39,11 @@ int main(int argc, char* const argv[]) 


    Vector<String16> services;

    Vector<String16> args;

    if (argc == 1) {

    bool showListOnly = false;

    if ((argc == 2) && (strcmp(argv[1], "-l") == 0)) {

        showListOnly = true;

    }

    if ((argc == 1) || showListOnly) {

        services = sm->listServices();

        services.sort(sort_func);

        args.add(String16("-a"));
@@ -64,6 +68,10 @@ int main(int argc, char* const argv[]) 
        }

    }



    if (showListOnly) {

        return 0;

    }



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

        sp<IBinder> service = sm->checkService(services[i]);

        if (service != NULL) {