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

Commit 6270dd1b authored by Steven Moreland's avatar Steven Moreland
Browse files

dumpsys: add option to list hardware services. 

This gives a convenient way to dump information about hidl services.
When hidl services dump information themselves as well, that dump will
be made here as well.

Bug: 33382892
Test: dumpsys_test, dumpsys --hw works as expected
Change-Id: Ib08b5d052e63ed6260035ee8d3ad3dac296202b1
parent 7ebfeb9d

cmds/dumpsys/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ cc_defaults { 
        "libutils",

        "liblog",

        "libbinder",

        "android.hidl.manager@1.0",

        "libhidlbase"

    ],



    clang: true,

cmds/dumpsys/dumpsys.cpp

+38 −4
Original line number Diff line number Diff line
@@ -45,8 +45,7 @@ using android::base::StringPrintf; 
using android::base::unique_fd;

using android::base::WriteFully;



static int sort_func(const String16* lhs, const String16* rhs)

{

static int sort_func(const String16* lhs, const String16* rhs) {

    return lhs->compare(*rhs);

}
@@ -55,10 +54,11 @@ static void usage() { 
        "usage: dumpsys\n"

            "         To dump all services.\n"

            "or:\n"

            "       dumpsys [-t TIMEOUT] [--help | -l | --skip SERVICES | SERVICE [ARGS]]\n"

            "       dumpsys [-t TIMEOUT] [--help | --hw | -l | --skip SERVICES | SERVICE [ARGS]]\n"

            "         --help: shows this help\n"

            "         -l: only list services, do not dump them\n"

            "         -t TIMEOUT: TIMEOUT to use in seconds instead of default 10 seconds\n"

            "         --hw: list all hw services running on the device\n"

            "         --skip SERVICES: dumps all services but SERVICES (comma-separated list)\n"

            "         SERVICE [ARGS]: dumps only service SERVICE, optionally passing ARGS to it\n");

}
@@ -72,16 +72,42 @@ static bool IsSkipped(const Vector<String16>& skipped, const String16& service) 
    return false;

}



static void ListHardwareServices(android::hidl::manager::V1_0::IServiceManager* hm) {

    using android::hardware::hidl_vec;

    using android::hardware::hidl_string;

    using android::hardware::Return;

    using android::sp;



    if (hm == nullptr) {

        ALOGE("Unable to get hardware service manager!");

        aerr << "Failed to get hardware service manager!";

        return;

    }



    Return<void> ret = hm->list([](const hidl_vec<hidl_string> &registered){

        aout << "Currently running hardware services:" << endl;

        for (const auto &service : registered) {

            aout << "  " << service << endl;

        }

    });



    if (!ret.isOk()) {

        aerr << "Failed to list hardware services: " << ret.description();

    }

}



int Dumpsys::main(int argc, char* const argv[]) {

    Vector<String16> services;

    Vector<String16> args;

    Vector<String16> skippedServices;

    bool showListOnly = false;

    bool listHwOnly = false;

    bool skipServices = false;

    int timeoutArg = 10;

    static struct option longOptions[] = {

        {"skip", no_argument, 0,  0 },

        {"help", no_argument, 0,  0 },

        {"hw",   no_argument, 0,  0 },

        {     0,           0, 0,  0 }

    };
@@ -105,6 +131,8 @@ int Dumpsys::main(int argc, char* const argv[]) { 
            } else if (!strcmp(longOptions[optionIndex].name, "help")) {

                usage();

                return 0;

            } else if (!strcmp(longOptions[optionIndex].name, "hw")) {

                listHwOnly = true;

            }

            break;
@@ -143,11 +171,17 @@ int Dumpsys::main(int argc, char* const argv[]) { 
    }



    if ((skipServices && skippedServices.empty()) ||

            (showListOnly && (!services.empty() || !skippedServices.empty()))) {

            (showListOnly && (!services.empty() || !skippedServices.empty())) ||

            (listHwOnly && (skipServices || services.size() > 0 || showListOnly))) {

        usage();

        return -1;

    }



    if (listHwOnly) {

        ListHardwareServices(hm_);

        return 0;

    }



    if (services.empty() || showListOnly) {

        // gets all services

        services = sm_->listServices();

cmds/dumpsys/dumpsys.h

+4 −1
Original line number Diff line number Diff line
@@ -17,18 +17,21 @@ 
#ifndef FRAMEWORK_NATIVE_CMD_DUMPSYS_H_

#define FRAMEWORK_NATIVE_CMD_DUMPSYS_H_



#include <android/hidl/manager/1.0/IServiceManager.h>

#include <binder/IServiceManager.h>



namespace android {



class Dumpsys {

  public:

    Dumpsys(android::IServiceManager* sm) : sm_(sm) {

    Dumpsys(android::IServiceManager* sm,

            android::hidl::manager::V1_0::IServiceManager* hm) : sm_(sm), hm_(hm) {

    }

    int main(int argc, char* const argv[]);



  private:

    android::IServiceManager* sm_;

    android::hidl::manager::V1_0::IServiceManager* hm_;

};

}

cmds/dumpsys/main.cpp

+4 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <stdio.h>



using namespace android;

using HServiceManager = android::hidl::manager::V1_0::IServiceManager;



int main(int argc, char* const argv[]) {

    signal(SIGPIPE, SIG_IGN);
@@ -38,6 +39,8 @@ int main(int argc, char* const argv[]) { 
        return 20;

    }



    Dumpsys dumpsys(sm.get());

    sp<HServiceManager> hm = HServiceManager::getService("manager");



    Dumpsys dumpsys(sm.get(), hm.get());

    return dumpsys.main(argc, argv);

}

cmds/dumpsys/tests/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -5,8 +5,12 @@ cc_test { 
    srcs: ["dumpsys_test.cpp"],



    shared_libs: [

        "android.hidl.manager@1.0",

        "libbase",

        "libbinder",

        "liblog",

        "libhidlbase",

        "libhidltransport",

        "libutils",

    ],