perf ui: Add ui_progress__finish()
Sometimes we need to know when the progress bar should disappear. Checking curr >= total wasn't enough since there're cases not met that condition for the last call. So add a new ->finish callback to identify this explicitly. Currently only GTK frontend needs it. Signed-off-by: Namhyung Kim <namhyung@kernel.org> Cc: Ingo Molnar <mingo@kernel.org> Cc: Pekka Enberg <penberg@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/1352813436-14173-4-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
a753579c3e
commit
a5580f3ecb
|
@ -40,8 +40,17 @@ static void gtk_progress_update(u64 curr, u64 total, const char *title)
|
|||
gtk_main_iteration();
|
||||
}
|
||||
|
||||
static void gtk_progress_finish(void)
|
||||
{
|
||||
/* this will also destroy all of its children */
|
||||
gtk_widget_destroy(dialog);
|
||||
|
||||
dialog = NULL;
|
||||
}
|
||||
|
||||
static struct ui_progress gtk_progress_fns = {
|
||||
.update = gtk_progress_update,
|
||||
.finish = gtk_progress_finish,
|
||||
};
|
||||
|
||||
void perf_gtk__init_progress(void)
|
||||
|
|
|
@ -18,3 +18,9 @@ void ui_progress__update(u64 curr, u64 total, const char *title)
|
|||
{
|
||||
return progress_fns->update(curr, total, title);
|
||||
}
|
||||
|
||||
void ui_progress__finish(void)
|
||||
{
|
||||
if (progress_fns->finish)
|
||||
progress_fns->finish();
|
||||
}
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
|
||||
struct ui_progress {
|
||||
void (*update)(u64, u64, const char *);
|
||||
void (*finish)(void);
|
||||
};
|
||||
|
||||
extern struct ui_progress *progress_fns;
|
||||
|
@ -12,5 +13,6 @@ extern struct ui_progress *progress_fns;
|
|||
void ui_progress__init(void);
|
||||
|
||||
void ui_progress__update(u64 curr, u64 total, const char *title);
|
||||
void ui_progress__finish(void);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -26,6 +26,7 @@ int ui__error(const char *format, ...) __attribute__((format(printf, 1, 2)));
|
|||
static inline void ui_progress__update(u64 curr __maybe_unused,
|
||||
u64 total __maybe_unused,
|
||||
const char *title __maybe_unused) {}
|
||||
static inline void ui_progress__finish(void) {}
|
||||
|
||||
#define ui__error(format, arg...) ui__warning(format, ##arg)
|
||||
|
||||
|
|
|
@ -1458,6 +1458,7 @@ more:
|
|||
session->ordered_samples.next_flush = ULLONG_MAX;
|
||||
err = flush_sample_queue(session, tool);
|
||||
out_err:
|
||||
ui_progress__finish();
|
||||
perf_session__warn_about_errors(session, tool);
|
||||
perf_session_free_sample_buffers(session);
|
||||
return err;
|
||||
|
|
Loading…
Reference in New Issue