UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ftrace: pipe fixes 

Some fixes for better output with the trace pipe.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Steven Rostedt 2008-05-12 21:20:48 +02:00 committed by Thomas Gleixner
parent dcb6308f2b
commit 088b1e427d
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kernel/trace/trace.c
View File

@ -770,11 +770,6 @@ trace_entry_idx(struct trace_array *tr, struct trace_array_cpu *data,
array = page_address(page); array = page_address(page);
/* Still possible to catch up to the tail */
if (iter->next_idx[cpu] && array == data->trace_tail &&
iter->next_page_idx[cpu] == data->trace_tail_idx)
return NULL;
WARN_ON(iter->next_page_idx[cpu] >= ENTRIES_PER_PAGE); WARN_ON(iter->next_page_idx[cpu] >= ENTRIES_PER_PAGE);
return &array[iter->next_page_idx[cpu]]; return &array[iter->next_page_idx[cpu]];
} }
@ -1921,7 +1916,6 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
struct trace_iterator *iter = filp->private_data; struct trace_iterator *iter = filp->private_data;
struct trace_array_cpu *data; struct trace_array_cpu *data;
static cpumask_t mask; static cpumask_t mask;
struct trace_entry *entry;
static int start; static int start;
unsigned long flags; unsigned long flags;
int read = 0; int read = 0;
@ -2013,10 +2007,15 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
cpu_set(cpu, mask); cpu_set(cpu, mask);
} }
while ((entry = find_next_entry_inc(iter)) != NULL) { while (find_next_entry_inc(iter) != NULL) {
int len = iter->seq.len;
ret = print_trace_line(iter); ret = print_trace_line(iter);
if (!ret) if (!ret) {
/* don't print partial lines */
iter->seq.len = len;
break; break;
}
trace_consume(iter); trace_consume(iter);