Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 339034
b: refs/heads/master
c: a5580f3
h: refs/heads/master
v: v3
  • Loading branch information
Namhyung Kim authored and Arnaldo Carvalho de Melo committed Nov 14, 2012
1 parent ec09f67 commit 7f1bfc7
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a753579c3ec096bba9d24e1594a07dbb25aca8e4
refs/heads/master: a5580f3ecb295a514f9522daf0ef7158f73ec2d6
9 changes: 9 additions & 0 deletions trunk/tools/perf/ui/gtk/progress.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 6 additions & 0 deletions trunk/tools/perf/ui/progress.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
2 changes: 2 additions & 0 deletions trunk/tools/perf/ui/progress.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@

struct ui_progress {
void (*update)(u64, u64, const char *);
void (*finish)(void);
};

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
1 change: 1 addition & 0 deletions trunk/tools/perf/util/debug.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
1 change: 1 addition & 0 deletions trunk/tools/perf/util/session.c
Original file line number Diff line number Diff line change
Expand Up @@ -1458,6 +1458,7 @@ int __perf_session__process_events(struct perf_session *session,
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;
Expand Down

0 comments on commit 7f1bfc7

Please sign in to comment.