diff options
| author | 2024-02-28 20:59:11 +0000 | |
|---|---|---|
| committer | 2024-02-28 20:59:11 +0000 | |
| commit | 0829ececc9bcf35edcf48d158647af024a83dca2 (patch) | |
| tree | 16c42261336e4236414c19fea5bc2feda79e3536 | |
| parent | c2e69665235335d5964bc61b689f587193f95a05 (diff) | |
| parent | c8af4d3407f3d6be46fafdfc044ace55944fb4b7 (diff) | |
Merge "atrace: allow tracefs/buffer_percent RW use + remove dead code" into main
| -rw-r--r-- | cmds/atrace/atrace.cpp | 20 | ||||
| -rw-r--r-- | cmds/atrace/atrace.rc | 2 |
2 files changed, 2 insertions, 20 deletions
diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp index 5719a09a16..cd4926ad50 100644 --- a/cmds/atrace/atrace.cpp +++ b/cmds/atrace/atrace.cpp @@ -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); diff --git a/cmds/atrace/atrace.rc b/cmds/atrace/atrace.rc index 3e6d2e01f8..9b357e7163 100644 --- a/cmds/atrace/atrace.rc +++ b/cmds/atrace/atrace.rc @@ -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 |