Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
tools
/
perf
/
tests
/
hists_cumulate.c
diff --git
a/kernel/tools/perf/tests/hists_cumulate.c
b/kernel/tools/perf/tests/hists_cumulate.c
index
1861996
..
7ed7370
100644
(file)
--- a/
kernel/tools/perf/tests/hists_cumulate.c
+++ b/
kernel/tools/perf/tests/hists_cumulate.c
@@
-87,6
+87,8
@@
static int add_hist_entries(struct hists *hists, struct machine *machine)
},
};
struct hist_entry_iter iter = {
},
};
struct hist_entry_iter iter = {
+ .evsel = evsel,
+ .sample = &sample,
.hide_unresolved = false,
};
.hide_unresolved = false,
};
@@
-104,9
+106,11
@@
static int add_hist_entries(struct hists *hists, struct machine *machine)
&sample) < 0)
goto out;
&sample) < 0)
goto out;
- if (hist_entry_iter__add(&iter, &al, evsel, &sample,
- PERF_MAX_STACK_DEPTH, NULL) < 0)
+ if (hist_entry_iter__add(&iter, &al, PERF_MAX_STACK_DEPTH,
+ NULL) < 0) {
+ addr_location__put(&al);
goto out;
goto out;
+ }
fake_samples[i].thread = al.thread;
fake_samples[i].map = al.map;
fake_samples[i].thread = al.thread;
fake_samples[i].map = al.map;
@@
-275,6
+279,7
@@
static int test1(struct perf_evsel *evsel, struct machine *machine)
symbol_conf.use_callchain = false;
symbol_conf.cumulate_callchain = false;
symbol_conf.use_callchain = false;
symbol_conf.cumulate_callchain = false;
+ perf_evsel__reset_sample_bit(evsel, CALLCHAIN);
setup_sorting();
callchain_register_param(&callchain_param);
setup_sorting();
callchain_register_param(&callchain_param);
@@
-421,6
+426,7
@@
static int test2(struct perf_evsel *evsel, struct machine *machine)
symbol_conf.use_callchain = true;
symbol_conf.cumulate_callchain = false;
symbol_conf.use_callchain = true;
symbol_conf.cumulate_callchain = false;
+ perf_evsel__set_sample_bit(evsel, CALLCHAIN);
setup_sorting();
callchain_register_param(&callchain_param);
setup_sorting();
callchain_register_param(&callchain_param);
@@
-478,6
+484,7
@@
static int test3(struct perf_evsel *evsel, struct machine *machine)
symbol_conf.use_callchain = false;
symbol_conf.cumulate_callchain = true;
symbol_conf.use_callchain = false;
symbol_conf.cumulate_callchain = true;
+ perf_evsel__reset_sample_bit(evsel, CALLCHAIN);
setup_sorting();
callchain_register_param(&callchain_param);
setup_sorting();
callchain_register_param(&callchain_param);
@@
-661,6
+668,7
@@
static int test4(struct perf_evsel *evsel, struct machine *machine)
symbol_conf.use_callchain = true;
symbol_conf.cumulate_callchain = true;
symbol_conf.use_callchain = true;
symbol_conf.cumulate_callchain = true;
+ perf_evsel__set_sample_bit(evsel, CALLCHAIN);
setup_sorting();
callchain_register_param(&callchain_param);
setup_sorting();
callchain_register_param(&callchain_param);
@@
-695,7
+703,7
@@
int test__hists_cumulate(void)
TEST_ASSERT_VAL("No memory", evlist);
TEST_ASSERT_VAL("No memory", evlist);
- err = parse_events(evlist, "cpu-clock");
+ err = parse_events(evlist, "cpu-clock"
, NULL
);
if (err)
goto out;
if (err)
goto out;