perf ui: Rename ui_progress to ui_progress_ops
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 4779a2e99af80e133ee1c70c7093dc6cc13429a1 Gitweb: http://git.kernel.org/tip/4779a2e99af80e133ee1c70c7093dc6cc13429a1 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Wed, 23 Oct 2013 14:08:48 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 23 Oct 2013 14:41:23 -0300
perf ui: Rename ui_progress to ui_progress_ops
Reserving 'struct ui_progress' to the per progress instances, not to the particular set of operations used to implmenet a progress bar in the current UI (GTK, TUI, etc).
Cc Adrian Hunter <[email protected]>
Cc David Ahern <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/Makefile.perf | 1 + tools/perf/ui/gtk/gtk.h | 2 +- tools/perf/ui/gtk/progress.c | 14 +++++++------- tools/perf/ui/gtk/setup.c | 2 +- tools/perf/ui/progress.c | 18 +++++++++--------- tools/perf/ui/progress.h | 6 ++---- tools/perf/ui/tui/progress.c | 7 ++++--- tools/perf/ui/tui/setup.c | 3 ++- tools/perf/ui/tui/tui.h | 6 ++++++ 9 files changed, 33 insertions(+), 26 deletions(-)
tools/perf/Makefile.perf +1 -0
@@ -487,6 +487,7 @@ ifndef NO_SLANG LIB_OBJS += $(OUTPUT)ui/tui/util.o LIB_OBJS += $(OUTPUT)ui/tui/helpline.o LIB_OBJS += $(OUTPUT)ui/tui/progress.o + LIB_H += ui/tui/tui.h LIB_H += ui/browser.h LIB_H += ui/browsers/map.h LIB_H += ui/keysyms.h
tools/perf/ui/gtk/gtk.h +1 -1
@@ -34,7 +34,7 @@ struct perf_gtk_context *perf_gtk__activate_context(GtkWidget *window);int perf_gtk__deactivate_context (struct perf_gtk_context **ctx);void perf_gtk__init_helpline (void ); -void perf_gtk__init_progress (void ); +void gtk_ui_progress__init (void );void perf_gtk__init_hpp (void );void perf_gtk__signal (int sig);
tools/perf/ui/gtk/progress.c +7 -7
@@ -7,7 +7,7 @@static GtkWidget *dialog;static GtkWidget *progress; -static void gtk_progress_update (u64 curr,u64 total,const char *title) +static void gtk_ui_progress__update (u64 curr,u64 total,const char *title) {double fraction = total ?1.0 * curr / total :0.0 ;char buf[1024 ];
@@ -40,7 +40,7 @@ static void gtk_progress_update(u64 curr, u64 total, const char *title)gtk_main_iteration (); } -static void gtk_progress_finish (void ) +static void gtk_ui_progress__finish (void ) {/* this will also destroy all of its children */ gtk_widget_destroy (dialog);
@@ -48,12 +48,12 @@ static void gtk_progress_finish(void) dialog =NULL ; } -static struct ui_progress gtk_progress_fns = { - .update = gtk_progress_update, - .finish = gtk_progress_finish, +static struct ui_progress_ops gtk_ui_progress__ops = { + .update = gtk_ui_progress__update, + .finish = gtk_ui_progress__finish, }; -void perf_gtk__init_progress (void ) +void gtk_ui_progress__init (void ) { - progress_fns = >k_progress_fns; + ui_progress__ops = >k_ui_progress__ops; }
tools/perf/ui/gtk/setup.c +1 -1
@@ -8,7 +8,7 @@ int perf_gtk__init(void) {perf_error__register (&perf_gtk_eops);perf_gtk__init_helpline (); -perf_gtk__init_progress (); +gtk_ui_progress__init ();perf_gtk__init_hpp ();return gtk_init_check (NULL ,NULL ) ?0 :-1 ;
tools/perf/ui/progress.c +9 -9
@@ -1,26 +1,26 @@#include "../cache.h" #include "progress.h" -static void nop_progress_update (u64 curr__maybe_unused , -u64 total__maybe_unused , -const char *title__maybe_unused ) +static void null_progress__update (u64 curr__maybe_unused , +u64 total__maybe_unused , +const char *title__maybe_unused ) { } -static struct ui_progress default_progress_fns = +static struct ui_progress_ops null_progress__ops = { - .update = nop_progress_update, + .update = null_progress__update, }; -struct ui_progress *progress_fns = &default_progress_fns; +struct ui_progress_ops *ui_progress__ops = &null_progress__ops;void ui_progress__update (u64 curr,u64 total,const char *title) { -return progress_fns->update (curr, total, title); +return ui_progress__ops->update (curr, total, title); }void ui_progress__finish (void ) { -if (progress_fns->finish) - progress_fns->finish (); +if (ui_progress__ops->finish) + ui_progress__ops->finish (); }
tools/perf/ui/progress.h +2 -4
@@ -3,14 +3,12 @@#include <../types.h> -struct ui_progress { +struct ui_progress_ops {void (*update)(u64 ,u64 ,const char *);void (*finish)(void ); }; -extern struct ui_progress *progress_fns; - -void ui_progress__init (void ); +extern struct ui_progress_ops *ui_progress__ops;void ui_progress__update (u64 curr,u64 total,const char *title);void ui_progress__finish (void );
tools/perf/ui/tui/progress.c +4 -3
@@ -2,6 +2,7 @@#include "../progress.h" #include "../libslang.h" #include "../ui.h" +#include "tui.h" #include "../browser.h" static void tui_progress__update (u64 curr,u64 total,const char *title)
@@ -31,12 +32,12 @@ static void tui_progress__update(u64 curr, u64 total, const char *title)pthread_mutex_unlock (&ui__lock); } -static struct ui_progress tui_progress_fns = +static struct ui_progress_ops tui_progress__ops = { .update = tui_progress__update, }; -void ui_progress__init (void ) +void tui_progress__init (void ) { - progress_fns = &tui_progress_fns; + ui_progress__ops = &tui_progress__ops; }
tools/perf/ui/tui/setup.c +2 -1
@@ -9,6 +9,7 @@#include "../util.h" #include "../libslang.h" #include "../keysyms.h" +#include "tui.h" static volatile int ui__need_resize;
@@ -119,7 +120,7 @@ int ui__init(void)ui_helpline__init ();ui_browser__init (); -ui_progress__init (); +tui_progress__init ();signal (SIGSEGV , ui__signal);signal (SIGFPE , ui__signal);
tools/perf/ui/tui/tui.h new file +6 -0
@@ -0,0 +1,6 @@ +#ifndef _PERF_TUI_H_ +#define _PERF_TUI_H_ 1 + +void tui_progress__init (void ); + +#endif /* _PERF_TUI_H_ */