diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-12 21:20:11 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-12 21:20:11 -0400 |
commit | ade0899b298ba2c43bfd6abd8cbc2545944cde0c (patch) | |
tree | a448dfb440b3b958b6306bb43620cd5d76f504bf /tools/perf/ui/gtk/browser.c | |
parent | 871a0596cb2f51b57dc583d1a7c4be0186582fe7 (diff) | |
parent | 95cf59ea72331d0093010543b8951bb43f262cac (diff) |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf updates from Ingo Molnar:
"This tree includes some late late perf items that missed the first
round:
tools:
- Bash auto completion improvements, now we can auto complete the
tools long options, tracepoint event names, etc, from Namhyung Kim.
- Look up thread using tid instead of pid in 'perf sched'.
- Move global variables into a perf_kvm struct, from David Ahern.
- Hists refactorings, preparatory for improved 'diff' command, from
Jiri Olsa.
- Hists refactorings, preparatory for event group viewieng work, from
Namhyung Kim.
- Remove double negation on optional feature macro definitions, from
Namhyung Kim.
- Remove several cases of needless global variables, on most
builtins.
- misc fixes
kernel:
- sysfs support for IBS on AMD CPUs, from Robert Richter.
- Support for an upcoming Intel CPU, the Xeon-Phi / Knights Corner
HPC blade PMU, from Vince Weaver.
- misc fixes"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (46 commits)
perf: Fix perf_cgroup_switch for sw-events
perf: Clarify perf_cpu_context::active_pmu usage by renaming it to ::unique_pmu
perf/AMD/IBS: Add sysfs support
perf hists: Add more helpers for hist entry stat
perf hists: Move he->stat.nr_events initialization to a template
perf hists: Introduce struct he_stat
perf diff: Removing the total_period argument from output code
perf tool: Add hpp interface to enable/disable hpp column
perf tools: Removing hists pair argument from output path
perf hists: Separate overhead and baseline columns
perf diff: Refactor diff displacement possition info
perf hists: Add struct hists pointer to struct hist_entry
perf tools: Complete tracepoint event names
perf/x86: Add support for Intel Xeon-Phi Knights Corner PMU
perf evlist: Remove some unused methods
perf evlist: Introduce add_newtp method
perf kvm: Move global variables into a perf_kvm struct
perf tools: Convert to BACKTRACE_SUPPORT
perf tools: Long option completion support for each subcommands
perf tools: Complete long option names of perf command
...
Diffstat (limited to 'tools/perf/ui/gtk/browser.c')
-rw-r--r-- | tools/perf/ui/gtk/browser.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/ui/gtk/browser.c b/tools/perf/ui/gtk/browser.c index 7ff99ec1d95e..4125c6284114 100644 --- a/tools/perf/ui/gtk/browser.c +++ b/tools/perf/ui/gtk/browser.c | |||
@@ -49,7 +49,8 @@ static const char *perf_gtk__get_percent_color(double percent) | |||
49 | static int perf_gtk__hpp_color_ ## _name(struct perf_hpp *hpp, \ | 49 | static int perf_gtk__hpp_color_ ## _name(struct perf_hpp *hpp, \ |
50 | struct hist_entry *he) \ | 50 | struct hist_entry *he) \ |
51 | { \ | 51 | { \ |
52 | double percent = 100.0 * he->_field / hpp->total_period; \ | 52 | struct hists *hists = he->hists; \ |
53 | double percent = 100.0 * he->stat._field / hists->stats.total_period; \ | ||
53 | const char *markup; \ | 54 | const char *markup; \ |
54 | int ret = 0; \ | 55 | int ret = 0; \ |
55 | \ | 56 | \ |
@@ -73,7 +74,7 @@ HPP__COLOR_FN(overhead_guest_us, period_guest_us) | |||
73 | 74 | ||
74 | void perf_gtk__init_hpp(void) | 75 | void perf_gtk__init_hpp(void) |
75 | { | 76 | { |
76 | perf_hpp__init(false, false); | 77 | perf_hpp__init(); |
77 | 78 | ||
78 | perf_hpp__format[PERF_HPP__OVERHEAD].color = | 79 | perf_hpp__format[PERF_HPP__OVERHEAD].color = |
79 | perf_gtk__hpp_color_overhead; | 80 | perf_gtk__hpp_color_overhead; |
@@ -102,7 +103,6 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists) | |||
102 | struct perf_hpp hpp = { | 103 | struct perf_hpp hpp = { |
103 | .buf = s, | 104 | .buf = s, |
104 | .size = sizeof(s), | 105 | .size = sizeof(s), |
105 | .total_period = hists->stats.total_period, | ||
106 | }; | 106 | }; |
107 | 107 | ||
108 | nr_cols = 0; | 108 | nr_cols = 0; |