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

Commit 8fce1536 authored by Carmen Jackson's avatar Carmen Jackson Committed by android-build-merger
Browse files

Merge "Atrace: Add the debug.atrace.user_initiated property." 

am: d9671a4a

Change-Id: Iaf97d7dd182f91d2f29c7a045549813d70a754b8
parents c2d7a9e5 d9671a4a

cmds/atrace/atrace.cpp

+14 −0
Original line number Original line Diff line number Diff line
@@ -58,6 +58,7 @@ using std::string; 
#define MAX_SYS_FILES 10

#define MAX_SYS_FILES 10





const char* k_traceTagsProperty = "debug.atrace.tags.enableflags";

const char* k_traceTagsProperty = "debug.atrace.tags.enableflags";

const char* k_userInitiatedTraceProperty = "debug.atrace.user_initiated";





const char* k_traceAppsNumberProperty = "debug.atrace.app_number";

const char* k_traceAppsNumberProperty = "debug.atrace.app_number";

const char* k_traceAppsPropertyTemplate = "debug.atrace.app_%d";

const char* k_traceAppsPropertyTemplate = "debug.atrace.app_%d";
@@ -444,6 +445,16 @@ static bool setTraceOverwriteEnable(bool enable) 
    return setKernelOptionEnable(k_tracingOverwriteEnablePath, enable);

    return setKernelOptionEnable(k_tracingOverwriteEnablePath, enable);

}

}





// Set the user initiated trace property

static bool setUserInitiatedTraceProperty(bool enable)

{

    if (!android::base::SetProperty(k_userInitiatedTraceProperty, enable ? "1" : "")) {

        fprintf(stderr, "error setting user initiated strace system property\n");

        return false;

    }

    return true;

}



// Enable or disable kernel tracing.

// Enable or disable kernel tracing.

static bool setTracingEnabled(bool enable)

static bool setTracingEnabled(bool enable)

{

{
@@ -837,6 +848,8 @@ static bool setUpKernelTracing() 
{

{

    bool ok = true;

    bool ok = true;





    ok &= setUserInitiatedTraceProperty(true);



    // Set up the tracing options.

    // Set up the tracing options.

    ok &= setCategoriesEnableFromFile(g_categoriesFile);

    ok &= setCategoriesEnableFromFile(g_categoriesFile);

    ok &= setTraceOverwriteEnable(g_traceOverwrite);

    ok &= setTraceOverwriteEnable(g_traceOverwrite);
@@ -884,6 +897,7 @@ static void cleanUpKernelTracing() 
    setTraceBufferSizeKB(1);

    setTraceBufferSizeKB(1);

    setPrintTgidEnableIfPresent(false);

    setPrintTgidEnableIfPresent(false);

    setKernelTraceFuncs(NULL);

    setKernelTraceFuncs(NULL);

    setUserInitiatedTraceProperty(false);

}

}





// Enable tracing in the kernel.

// Enable tracing in the kernel.