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

Commit f9a10e2c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "atrace: Make atrace notify VR services of new trace sessions"

parents 32802849 213feb32

cmds/atrace/Android.bp

+3 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,9 @@ cc_binary { 
        "libz",

        "libz",

        "libbase",

        "libbase",

    ],

    ],

    static_libs: [

        "libpdx_default_transport",

    ],





    init_rc: ["atrace.rc"],

    init_rc: ["atrace.rc"],

}
 
}

cmds/atrace/atrace.cpp

+45 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ 




#include <errno.h>

#include <errno.h>

#include <fcntl.h>

#include <fcntl.h>

#include <ftw.h>

#include <getopt.h>

#include <getopt.h>

#include <inttypes.h>

#include <inttypes.h>

#include <signal.h>

#include <signal.h>
@@ -41,6 +42,7 @@ 
#include <hidl/ServiceManagement.h>

#include <hidl/ServiceManagement.h>

#include <cutils/properties.h>

#include <cutils/properties.h>





#include <pdx/default_transport/service_utility.h>

#include <utils/String8.h>

#include <utils/String8.h>

#include <utils/Timers.h>

#include <utils/Timers.h>

#include <utils/Tokenizer.h>

#include <utils/Tokenizer.h>
@@ -48,6 +50,7 @@ 
#include <android-base/file.h>

#include <android-base/file.h>





using namespace android;

using namespace android;

using pdx::default_transport::ServiceUtility;





using std::string;

using std::string;

#define NELEM(x) ((int) (sizeof(x) / sizeof((x)[0])))

#define NELEM(x) ((int) (sizeof(x) / sizeof((x)[0])))
@@ -569,6 +572,46 @@ static void pokeHalServices() 
    }

    }

}

}





// Sends the sysprop_change message to the service at fpath, so it re-reads its

// system properties. Returns 0 on success or a negated errno code on failure.

static int pokeOnePDXService(const char *fpath, const struct stat * /*sb*/,

                             int typeflag, struct FTW * /*ftwbuf*/)

{

    const bool kIgnoreErrors = true;



    if (typeflag == FTW_F) {

        int error;

        auto utility = ServiceUtility::Create(fpath, &error);

        if (!utility) {

            if (error != -ECONNREFUSED) {

                ALOGE("pokeOnePDXService: Failed to open %s, %s.", fpath,

                      strerror(-error));

            }

            return kIgnoreErrors ? 0 : error;

        }



        auto status = utility->ReloadSystemProperties();

        if (!status) {

            ALOGE("pokeOnePDXService: Failed to send sysprop change to %s, "

                  "error %d, %s.", fpath, status.error(),

                  status.GetErrorMessage().c_str());

            return kIgnoreErrors ? 0 : -status.error();

        }

    }



    return 0;

}



// Pokes all the PDX processes in the system to get them to re-read

// their system properties. Returns true on success, false on failure.

static bool pokePDXServices()

{

    const int kMaxDepth = 16;

    const int result = nftw(ServiceUtility::GetRootEndpointPath().c_str(),

                            pokeOnePDXService, kMaxDepth, FTW_PHYS);

    return result == 0 ? true : false;

}



// Set the trace tags that userland tracing uses, and poke the running

// Set the trace tags that userland tracing uses, and poke the running

// processes to pick up the new value.

// processes to pick up the new value.

static bool setTagsProperty(uint64_t tags)

static bool setTagsProperty(uint64_t tags)
@@ -812,6 +855,7 @@ static bool setUpTrace() 
    ok &= setAppCmdlineProperty(&packageList[0]);

    ok &= setAppCmdlineProperty(&packageList[0]);

    ok &= pokeBinderServices();

    ok &= pokeBinderServices();

    pokeHalServices();

    pokeHalServices();

    ok &= pokePDXServices();





    // Disable all the sysfs enables.  This is done as a separate loop from

    // Disable all the sysfs enables.  This is done as a separate loop from

    // the enables to allow the same enable to exist in multiple categories.

    // the enables to allow the same enable to exist in multiple categories.
@@ -849,6 +893,7 @@ static void cleanUpTrace() 
    setTagsProperty(0);

    setTagsProperty(0);

    clearAppProperties();

    clearAppProperties();

    pokeBinderServices();

    pokeBinderServices();

    pokePDXServices();





    // Set the options back to their defaults.

    // Set the options back to their defaults.

    setTraceOverwriteEnable(true);

    setTraceOverwriteEnable(true);