projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
perf evlist: Introduce evlist__for_each() & friends
[linux-2.6-block.git]
/
tools
/
perf
/
builtin-diff.c
diff --git
a/tools/perf/builtin-diff.c
b/tools/perf/builtin-diff.c
index 3b67ea2444bd4abf8314ef5c40c7d4b3e731c455..987cac3b4bbad36a3b59ef2e93a7db4bb8e54d30 100644
(file)
--- a/
tools/perf/builtin-diff.c
+++ b/
tools/perf/builtin-diff.c
@@
-356,9
+356,10
@@
static struct perf_evsel *evsel_match(struct perf_evsel *evsel,
{
struct perf_evsel *e;
{
struct perf_evsel *e;
- list_for_each_entry(e, &evlist->entries, node)
+ evlist__for_each(evlist, e) {
if (perf_evsel__match2(evsel, e))
return e;
if (perf_evsel__match2(evsel, e))
return e;
+ }
return NULL;
}
return NULL;
}
@@
-367,7
+368,7
@@
static void perf_evlist__collapse_resort(struct perf_evlist *evlist)
{
struct perf_evsel *evsel;
{
struct perf_evsel *evsel;
-
list_for_each_entry(evsel, &evlist->entries, node
) {
+
evlist__for_each(evlist, evsel
) {
struct hists *hists = &evsel->hists;
hists__collapse_resort(hists, NULL);
struct hists *hists = &evsel->hists;
hists__collapse_resort(hists, NULL);
@@
-614,7
+615,7
@@
static void data_process(void)
struct perf_evsel *evsel_base;
bool first = true;
struct perf_evsel *evsel_base;
bool first = true;
-
list_for_each_entry(evsel_base, &evlist_base->entries, nod
e) {
+
evlist__for_each(evlist_base, evsel_bas
e) {
struct data__file *d;
int i;
struct data__file *d;
int i;
@@
-654,7
+655,7
@@
static void data__free(struct data__file *d)
for (col = 0; col < PERF_HPP_DIFF__MAX_INDEX; col++) {
struct diff_hpp_fmt *fmt = &d->fmt[col];
for (col = 0; col < PERF_HPP_DIFF__MAX_INDEX; col++) {
struct diff_hpp_fmt *fmt = &d->fmt[col];
-
free(
fmt->header);
+
zfree(&
fmt->header);
}
}
}
}
@@
-1000,8
+1001,7
@@
static int data_init(int argc, const char **argv)
data__files_cnt = argc;
use_default = false;
}
data__files_cnt = argc;
use_default = false;
}
- } else if (symbol_conf.default_guest_vmlinux_name ||
- symbol_conf.default_guest_kallsyms) {
+ } else if (perf_guest) {
defaults[0] = "perf.data.host";
defaults[1] = "perf.data.guest";
}
defaults[0] = "perf.data.host";
defaults[1] = "perf.data.guest";
}