lkml.org 
[lkml]   [2016]   [Jan]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 14/26] perf tools: Introduce struct perf_hpp_list
Date
Gather output and sort lists under struct perf_hpp_list,
so we could have multiple instancies of sort/output format
entries.

Replacing current perf_hpp__list and perf_hpp__sort_list
lists with single perf_hpp_list instance.

Link: http://lkml.kernel.org/n/tip-bdn1hamlwp2529thajbrh2w7@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/ui/hist.c | 11 ++++++-----
tools/perf/util/hist.h | 16 ++++++++++------
2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index 2cd1a03bf375..1253a62c422f 100644
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -436,9 +436,10 @@ struct perf_hpp_fmt perf_hpp__format[] = {
HPP__PRINT_FNS("Period", period, PERIOD)
};

-LIST_HEAD(perf_hpp__list);
-LIST_HEAD(perf_hpp__sort_list);
-
+struct perf_hpp_list perf_hpp_list = {
+ .list = LIST_HEAD_INIT(perf_hpp_list.list),
+ .sort_list = LIST_HEAD_INIT(perf_hpp_list.sort_list),
+};

#undef HPP__COLOR_PRINT_FNS
#undef HPP__COLOR_ACC_PRINT_FNS
@@ -506,7 +507,7 @@ void perf_hpp__init(void)

void perf_hpp__column_register(struct perf_hpp_fmt *format)
{
- list_add_tail(&format->list, &perf_hpp__list);
+ list_add_tail(&format->list, &perf_hpp_list.list);
}

void perf_hpp__column_unregister(struct perf_hpp_fmt *format)
@@ -516,7 +517,7 @@ void perf_hpp__column_unregister(struct perf_hpp_fmt *format)

void perf_hpp__register_sort_field(struct perf_hpp_fmt *format)
{
- list_add_tail(&format->sort_list, &perf_hpp__sort_list);
+ list_add_tail(&format->sort_list, &perf_hpp_list.sort_list);
}

void perf_hpp__cancel_cumulate(void)
diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index f3bcf2d38733..a9c8ccfcc284 100644
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -226,20 +226,24 @@ struct perf_hpp_fmt {
int idx;
};

-extern struct list_head perf_hpp__list;
-extern struct list_head perf_hpp__sort_list;
+struct perf_hpp_list {
+ struct list_head list;
+ struct list_head sort_list;
+};
+
+extern struct perf_hpp_list perf_hpp_list;

#define perf_hpp__for_each_format(format) \
- list_for_each_entry(format, &perf_hpp__list, list)
+ list_for_each_entry(format, &perf_hpp_list.list, list)

#define perf_hpp__for_each_format_safe(format, tmp) \
- list_for_each_entry_safe(format, tmp, &perf_hpp__list, list)
+ list_for_each_entry_safe(format, tmp, &perf_hpp_list.list, list)

#define perf_hpp__for_each_sort_list(format) \
- list_for_each_entry(format, &perf_hpp__sort_list, sort_list)
+ list_for_each_entry(format, &perf_hpp_list.sort_list, sort_list)

#define perf_hpp__for_each_sort_list_safe(format, tmp) \
- list_for_each_entry_safe(format, tmp, &perf_hpp__sort_list, sort_list)
+ list_for_each_entry_safe(format, tmp, &perf_hpp_list.sort_list, sort_list)

extern struct perf_hpp_fmt perf_hpp__format[];

--
2.4.3

\
 
 \ /
  Last update: 2016-01-18 11:01    [W:0.431 / U:0.656 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site