Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit ee6bce52276c0717ed3e63296e5d9465d339e923

Authored by Steven Rostedt
Committed by Ingo Molnar
1 parent 1696b2b0f4
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

ftrace: rename iter_ctrl to trace_options 

Impact: rename file /debug/tracing/iter_ctrl to /debug/tracing/trace_options

The original ftrace had a file called "iter_ctrl" that would control
the way the output was iterated. But this file grew into a catch all
for different trace options. This patch renames the file from iter_ctrl
to trace_options to reflect this change.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Showing 2 changed files with 16 additions and 16 deletions Side-by-side Diff

Documentation/ftrace.txt
Diff comments   View file @ ee6bce5
... ... @@ -82,7 +82,7 @@
82 82 tracer is not adding more data, they will display
83 83 the same information every time they are read.
84 84  
85   - iter_ctrl: This file lets the user control the amount of data
  85 + trace_options: This file lets the user control the amount of data
86 86 that is displayed in one of the above output
87 87 files.
88 88  
89 89  
90 90  
91 91  
92 92  
... ... @@ -316,23 +316,23 @@
316 316 The rest is the same as the 'trace' file.
317 317  
318 318  
319   -iter_ctrl
320   ----------
  319 +trace_options
  320 +-------------
321 321  
322   -The iter_ctrl file is used to control what gets printed in the trace
  322 +The trace_options file is used to control what gets printed in the trace
323 323 output. To see what is available, simply cat the file:
324 324  
325   - cat /debug/tracing/iter_ctrl
  325 + cat /debug/tracing/trace_options
326 326 print-parent nosym-offset nosym-addr noverbose noraw nohex nobin \
327 327 noblock nostacktrace nosched-tree
328 328  
329 329 To disable one of the options, echo in the option prepended with "no".
330 330  
331   - echo noprint-parent > /debug/tracing/iter_ctrl
  331 + echo noprint-parent > /debug/tracing/trace_options
332 332  
333 333 To enable an option, leave off the "no".
334 334  
335   - echo sym-offset > /debug/tracing/iter_ctrl
  335 + echo sym-offset > /debug/tracing/trace_options
336 336  
337 337 Here are the available options:
338 338  
kernel/trace/trace.c
Diff comments   View file @ ee6bce5
... ... @@ -204,7 +204,7 @@
204 204 /* trace_wait is a waitqueue for tasks blocked on trace_poll */
205 205 static DECLARE_WAIT_QUEUE_HEAD(trace_wait);
206 206  
207   -/* trace_flags holds iter_ctrl options */
  207 +/* trace_flags holds trace_options default values */
208 208 unsigned long trace_flags = TRACE_ITER_PRINT_PARENT | TRACE_ITER_PRINTK;
209 209  
210 210 /**
... ... @@ -2411,7 +2411,7 @@
2411 2411 };
2412 2412  
2413 2413 static ssize_t
2414   -tracing_iter_ctrl_read(struct file *filp, char __user *ubuf,
  2414 +tracing_trace_options_read(struct file *filp, char __user *ubuf,
2415 2415 size_t cnt, loff_t *ppos)
2416 2416 {
2417 2417 char *buf;
... ... @@ -2448,7 +2448,7 @@
2448 2448 }
2449 2449  
2450 2450 static ssize_t
2451   -tracing_iter_ctrl_write(struct file *filp, const char __user *ubuf,
  2451 +tracing_trace_options_write(struct file *filp, const char __user *ubuf,
2452 2452 size_t cnt, loff_t *ppos)
2453 2453 {
2454 2454 char buf[64];
... ... @@ -2493,8 +2493,8 @@
2493 2493  
2494 2494 static struct file_operations tracing_iter_fops = {
2495 2495 .open = tracing_open_generic,
2496   - .read = tracing_iter_ctrl_read,
2497   - .write = tracing_iter_ctrl_write,
  2496 + .read = tracing_trace_options_read,
  2497 + .write = tracing_trace_options_write,
2498 2498 };
2499 2499  
2500 2500 static const char readme_msg[] =
2501 2501  
... ... @@ -2508,9 +2508,9 @@
2508 2508 "# echo sched_switch > /debug/tracing/current_tracer\n"
2509 2509 "# cat /debug/tracing/current_tracer\n"
2510 2510 "sched_switch\n"
2511   - "# cat /debug/tracing/iter_ctrl\n"
  2511 + "# cat /debug/tracing/trace_options\n"
2512 2512 "noprint-parent nosym-offset nosym-addr noverbose\n"
2513   - "# echo print-parent > /debug/tracing/iter_ctrl\n"
  2513 + "# echo print-parent > /debug/tracing/trace_options\n"
2514 2514 "# echo 1 > /debug/tracing/tracing_enabled\n"
2515 2515 "# cat /debug/tracing/trace > /tmp/trace.txt\n"
2516 2516 "echo 0 > /debug/tracing/tracing_enabled\n"
2517 2517  
... ... @@ -3148,10 +3148,10 @@
3148 3148 if (!entry)
3149 3149 pr_warning("Could not create debugfs 'tracing_enabled' entry\n");
3150 3150  
3151   - entry = debugfs_create_file("iter_ctrl", 0644, d_tracer,
  3151 + entry = debugfs_create_file("trace_options", 0644, d_tracer,
3152 3152 NULL, &tracing_iter_fops);
3153 3153 if (!entry)
3154   - pr_warning("Could not create debugfs 'iter_ctrl' entry\n");
  3154 + pr_warning("Could not create debugfs 'trace_options' entry\n");
3155 3155  
3156 3156 entry = debugfs_create_file("tracing_cpumask", 0644, d_tracer,
3157 3157 NULL, &tracing_cpumask_fops);