AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

perf ui: Rename ui_progress to ui_progress_ops

Browse Source 
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 <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-zjqbfp9gx3yo45s0rp9uv42n@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2013-10-23 14:08:48 -03:00
parent 74af377bc2
commit 4779a2e99a
9 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/perf/Makefile.perf
View File

@ -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

2
tools/perf/ui/gtk/gtk.h
View File

@ -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);

14
tools/perf/ui/gtk/progress.c
View File

@ -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 = &gtk_progress_fns;
ui_progress__ops = &gtk_ui_progress__ops;
}

2
tools/perf/ui/gtk/setup.c
View File

@ -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;

18
tools/perf/ui/progress.c
View File

@ -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();
}

6
tools/perf/ui/progress.h
View File

@ -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);

7
tools/perf/ui/tui/progress.c
View File

@ -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;
}

3
tools/perf/ui/tui/setup.c
View File

@ -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);

6
tools/perf/ui/tui/tui.h Normal file
View File

@ -0,0 +1,6 @@
#ifndef _PERF_TUI_H_
#define _PERF_TUI_H_ 1
void tui_progress__init(void);
#endif /* _PERF_TUI_H_ */