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

perf thread-stack: Eliminate code duplicating thread_stack__pop_ks() 

Use new function thread_stack__pop_ks() in place of equivalent code.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/20190619064429.14940-3-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Adrian Hunter 2019-06-19 09:44:29 +03:00 committed by Arnaldo Carvalho de Melo
parent 97860b483c
commit eb5d854456
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/perf/util/thread-stack.c
View File

@ -664,12 +664,9 @@ static int thread_stack__no_call_return(struct thread *thread,
if (ip >= ks && addr < ks) { if (ip >= ks && addr < ks) {
/* Return to userspace, so pop all kernel addresses */ /* Return to userspace, so pop all kernel addresses */
while (thread_stack__in_kernel(ts)) { err = thread_stack__pop_ks(thread, ts, sample, ref);
err = thread_stack__call_return(thread, ts, --ts->cnt, if (err)
tm, ref, true); return err;
if (err)
return err;
}
/* If the stack is empty, push the userspace address */ /* If the stack is empty, push the userspace address */
if (!ts->cnt) { if (!ts->cnt) {
@ -679,12 +676,9 @@ static int thread_stack__no_call_return(struct thread *thread,
} }
} else if (thread_stack__in_kernel(ts) && ip < ks) { } else if (thread_stack__in_kernel(ts) && ip < ks) {
/* Return to userspace, so pop all kernel addresses */ /* Return to userspace, so pop all kernel addresses */
while (thread_stack__in_kernel(ts)) { err = thread_stack__pop_ks(thread, ts, sample, ref);
err = thread_stack__call_return(thread, ts, --ts->cnt, if (err)
tm, ref, true); return err;
if (err)
return err;
}
} }
if (ts->cnt) if (ts->cnt)