Commit cf3e0251 authored by Ross Zwisler's avatar Ross Zwisler Committed by Rafael J. Wysocki

PM: tools: use canonical ftrace path

The canonical location for the tracefs filesystem is at /sys/kernel/tracing.

But, from Documentation/trace/ftrace.rst:

  Before 4.1, all ftrace tracing control files were within the debugfs
  file system, which is typically located at /sys/kernel/debug/tracing.
  For backward compatibility, when mounting the debugfs file system,
  the tracefs file system will be automatically mounted at:

  /sys/kernel/debug/tracing

A few scripts in tools/power still refer to this older debugfs path, so
let's update them to avoid confusion.
Signed-off-by: default avatarRoss Zwisler <zwisler@google.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 6d796c50
...@@ -120,9 +120,9 @@ class SystemValues: ...@@ -120,9 +120,9 @@ class SystemValues:
cgexp = False cgexp = False
testdir = '' testdir = ''
outdir = '' outdir = ''
tpath = '/sys/kernel/debug/tracing/' tpath = '/sys/kernel/tracing/'
fpdtpath = '/sys/firmware/acpi/tables/FPDT' fpdtpath = '/sys/firmware/acpi/tables/FPDT'
epath = '/sys/kernel/debug/tracing/events/power/' epath = '/sys/kernel/tracing/events/power/'
pmdpath = '/sys/power/pm_debug_messages' pmdpath = '/sys/power/pm_debug_messages'
s0ixpath = '/sys/module/intel_pmc_core/parameters/warn_on_s0ix_failures' s0ixpath = '/sys/module/intel_pmc_core/parameters/warn_on_s0ix_failures'
s0ixres = '/sys/devices/system/cpu/cpuidle/low_power_idle_system_residency_us' s0ixres = '/sys/devices/system/cpu/cpuidle/low_power_idle_system_residency_us'
......
...@@ -248,7 +248,7 @@ def signal_handler(signal, frame): ...@@ -248,7 +248,7 @@ def signal_handler(signal, frame):
ipt.free_trace_buffer() ipt.free_trace_buffer()
sys.exit(0) sys.exit(0)
trace_file = "/sys/kernel/debug/tracing/events/amd_cpu/enable" trace_file = "/sys/kernel/tracing/events/amd_cpu/enable"
signal.signal(signal.SIGINT, signal_handler) signal.signal(signal.SIGINT, signal_handler)
interval = "" interval = ""
...@@ -319,7 +319,7 @@ print(cur_version) ...@@ -319,7 +319,7 @@ print(cur_version)
cleanup_data_files() cleanup_data_files()
if interval: if interval:
file_name = "/sys/kernel/debug/tracing/trace" file_name = "/sys/kernel/tracing/trace"
ipt.clear_trace_file() ipt.clear_trace_file()
ipt.set_trace_buffer_size(memory) ipt.set_trace_buffer_size(memory)
ipt.enable_trace(trace_file) ipt.enable_trace(trace_file)
......
...@@ -373,7 +373,7 @@ def clear_trace_file(): ...@@ -373,7 +373,7 @@ def clear_trace_file():
""" Clear trace file """ """ Clear trace file """
try: try:
f_handle = open('/sys/kernel/debug/tracing/trace', 'w') f_handle = open('/sys/kernel/tracing/trace', 'w')
f_handle.close() f_handle.close()
except: except:
print('IO error clearing trace file ') print('IO error clearing trace file ')
...@@ -401,7 +401,7 @@ def set_trace_buffer_size(memory): ...@@ -401,7 +401,7 @@ def set_trace_buffer_size(memory):
""" Set trace buffer size """ """ Set trace buffer size """
try: try:
with open('/sys/kernel/debug/tracing/buffer_size_kb', 'w') as fp: with open('/sys/kernel/tracing/buffer_size_kb', 'w') as fp:
fp.write(memory) fp.write(memory)
except: except:
print('IO error setting trace buffer size ') print('IO error setting trace buffer size ')
...@@ -411,7 +411,7 @@ def free_trace_buffer(): ...@@ -411,7 +411,7 @@ def free_trace_buffer():
""" Free the trace buffer memory """ """ Free the trace buffer memory """
try: try:
open('/sys/kernel/debug/tracing/buffer_size_kb' open('/sys/kernel/tracing/buffer_size_kb'
, 'w').write("1") , 'w').write("1")
except: except:
print('IO error freeing trace buffer ') print('IO error freeing trace buffer ')
...@@ -495,7 +495,7 @@ def signal_handler(signal, frame): ...@@ -495,7 +495,7 @@ def signal_handler(signal, frame):
sys.exit(0) sys.exit(0)
if __name__ == "__main__": if __name__ == "__main__":
trace_file = "/sys/kernel/debug/tracing/events/power/pstate_sample/enable" trace_file = "/sys/kernel/tracing/events/power/pstate_sample/enable"
signal.signal(signal.SIGINT, signal_handler) signal.signal(signal.SIGINT, signal_handler)
interval = "" interval = ""
...@@ -569,7 +569,7 @@ if __name__ == "__main__": ...@@ -569,7 +569,7 @@ if __name__ == "__main__":
cleanup_data_files() cleanup_data_files()
if interval: if interval:
filename = "/sys/kernel/debug/tracing/trace" filename = "/sys/kernel/tracing/trace"
clear_trace_file() clear_trace_file()
set_trace_buffer_size(memory) set_trace_buffer_size(memory)
enable_trace(trace_file) enable_trace(trace_file)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment