Commit-ID:  98a91837dd1751e730f8265129b376450f41dcfd
Gitweb:     http://git.kernel.org/tip/98a91837dd1751e730f8265129b376450f41dcfd
Author:     Arnaldo Carvalho de Melo <a...@redhat.com>
AuthorDate: Thu, 23 Jun 2016 11:34:10 -0300
Committer:  Arnaldo Carvalho de Melo <a...@redhat.com>
CommitDate: Thu, 23 Jun 2016 11:35:07 -0300

perf rb_resort: Rename for_each() macros to for_each_entry()

To match the semantics for list.h in the kernel, that are the
interface we use in them.

Cc: Adrian Hunter <adrian.hun...@intel.com>
Cc: David Ahern <dsah...@gmail.com>
Cc: Jiri Olsa <jo...@kernel.org>
Cc: Milian Wolff <milian.wo...@kdab.com>
Cc: Namhyung Kim <namhy...@kernel.org>
Cc: Taeung Song <treeze.tae...@gmail.com>
Cc: Wang Nan <wangn...@huawei.com>
Link: http://lkml.kernel.org/n/tip-iaxuq2yu43mtb504j96q0...@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
---
 tools/perf/builtin-trace.c  | 4 ++--
 tools/perf/util/rb_resort.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 1ba1341..cf90de8 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -2550,7 +2550,7 @@ static size_t thread__dump_stats(struct thread_trace 
*ttrace,
        printed += fprintf(fp, "                               (msec)    (msec) 
   (msec)    (msec)        (%%)\n");
        printed += fprintf(fp, "   --------------- -------- --------- --------- 
--------- ---------     ------\n");
 
-       resort_rb__for_each(nd, syscall_stats) {
+       resort_rb__for_each_entry(nd, syscall_stats) {
                struct stats *stats = syscall_stats_entry->stats;
                if (stats) {
                        double min = (double)(stats->min) / NSEC_PER_MSEC;
@@ -2627,7 +2627,7 @@ static size_t trace__fprintf_thread_summary(struct trace 
*trace, FILE *fp)
                return 0;
        }
 
-       resort_rb__for_each(nd, threads)
+       resort_rb__for_each_entry(nd, threads)
                printed += trace__fprintf_thread(fp, threads_entry->thread, 
trace);
 
        resort_rb__delete(threads);
diff --git a/tools/perf/util/rb_resort.h b/tools/perf/util/rb_resort.h
index abc76e3..808cc45 100644
--- a/tools/perf/util/rb_resort.h
+++ b/tools/perf/util/rb_resort.h
@@ -35,7 +35,7 @@ DEFINE_RB_RESORT_RB(threads, strcmp(a->thread->shortname,
 
        struct rb_node *nd;
 
-       resort_rb__for_each(nd, threads) {
+       resort_rb__for_each_entry(nd, threads) {
                struct thread *t = threads_entry;
                printf("%s: %d\n", t->shortname, t->tid);
        }
@@ -123,7 +123,7 @@ static void __name##_sorted__init_entry(struct rb_node *nd, 
                \
 struct __name##_sorted_entry *__name##_entry;                                  
\
 struct __name##_sorted *__name = __name##_sorted__new
 
-#define resort_rb__for_each(__nd, __name)                                      
\
+#define resort_rb__for_each_entry(__nd, __name)                                
        \
        for (__nd = rb_first(&__name->entries);                                 
\
             __name##_entry = rb_entry(__nd, struct __name##_sorted_entry,      
\
                                       rb_node), __nd;                          
\

Reply via email to