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

Commit 910618a2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "atrace: allow tracefs/buffer_percent RW use + remove dead code" into main am: 0829ecec 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2975539



Change-Id: I77cdeed1990e9e090b0cf9077a0852f6bfb1c25c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7303877b 0829ecec

cmds/atrace/atrace.cpp

+0 −20
Original line number Diff line number Diff line
@@ -313,12 +313,6 @@ static const char* k_traceClockPath = 
static const char* k_traceBufferSizePath =

    "buffer_size_kb";



#if 0

// TODO: Re-enable after stabilization

static const char* k_traceCmdlineSizePath =

    "saved_cmdlines_size";

#endif



static const char* k_tracingOverwriteEnablePath =

    "options/overwrite";
@@ -545,18 +539,6 @@ static bool setTraceBufferSizeKB(int size) 
    return writeStr(k_traceBufferSizePath, str);

}



#if 0

// TODO: Re-enable after stabilization

// Set the default size of cmdline hashtable

static bool setCmdlineSize()

{

    if (fileExists(k_traceCmdlineSizePath)) {

        return writeStr(k_traceCmdlineSizePath, "8192");

    }

    return true;

}

#endif



// Set the clock to the best available option while tracing. Use 'boot' if it's

// available; otherwise, use 'mono'. If neither are available use 'global'.

// Any write to the trace_clock sysfs file will reset the buffer, so only
@@ -870,8 +852,6 @@ static bool setUpKernelTracing() 
    ok &= setCategoriesEnableFromFile(g_categoriesFile);

    ok &= setTraceOverwriteEnable(g_traceOverwrite);

    ok &= setTraceBufferSizeKB(g_traceBufferSizeKB);

    // TODO: Re-enable after stabilization

    //ok &= setCmdlineSize();

    ok &= setClock();

    ok &= setPrintTgidEnableIfPresent(true);

    ok &= setKernelTraceFuncs(g_kernelTraceFuncs);

cmds/atrace/atrace.rc

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ on late-init 
# Access control to these files is now entirely in selinux policy.

    chmod 0666 /sys/kernel/debug/tracing/trace_clock

    chmod 0666 /sys/kernel/tracing/trace_clock

    chmod 0666 /sys/kernel/debug/tracing/buffer_percent

    chmod 0666 /sys/kernel/tracing/buffer_percent

    chmod 0666 /sys/kernel/debug/tracing/buffer_size_kb

    chmod 0666 /sys/kernel/tracing/buffer_size_kb

    chmod 0666 /sys/kernel/debug/tracing/options/overwrite