summaryrefslogtreecommitdiff
path: root/tools/perf/ui/tui
diff options
context:
space:
mode:
Diffstat (limited to 'tools/perf/ui/tui')
-rw-r--r--tools/perf/ui/tui/progress.c18
-rw-r--r--tools/perf/ui/tui/setup.c3
-rw-r--r--tools/perf/ui/tui/tui.h6
3 files changed, 9 insertions, 18 deletions
diff --git a/tools/perf/ui/tui/progress.c b/tools/perf/ui/tui/progress.c
index c61d14b..6c2184d 100644
--- a/tools/perf/ui/tui/progress.c
+++ b/tools/perf/ui/tui/progress.c
@@ -2,10 +2,9 @@
#include "../progress.h"
#include "../libslang.h"
#include "../ui.h"
-#include "tui.h"
#include "../browser.h"
-static void tui_progress__update(struct ui_progress *p)
+static void tui_progress__update(u64 curr, u64 total, const char *title)
{
int bar, y;
/*
@@ -15,30 +14,29 @@ static void tui_progress__update(struct ui_progress *p)
if (use_browser <= 0)
return;
- if (p->total == 0)
+ if (total == 0)
return;
- ui__refresh_dimensions(false);
+ ui__refresh_dimensions(true);
pthread_mutex_lock(&ui__lock);
y = SLtt_Screen_Rows / 2 - 2;
SLsmg_set_color(0);
SLsmg_draw_box(y, 0, 3, SLtt_Screen_Cols);
SLsmg_gotorc(y++, 1);
- SLsmg_write_string((char *)p->title);
- SLsmg_fill_region(y, 1, 1, SLtt_Screen_Cols - 2, ' ');
+ SLsmg_write_string((char *)title);
SLsmg_set_color(HE_COLORSET_SELECTED);
- bar = ((SLtt_Screen_Cols - 2) * p->curr) / p->total;
+ bar = ((SLtt_Screen_Cols - 2) * curr) / total;
SLsmg_fill_region(y, 1, 1, bar, ' ');
SLsmg_refresh();
pthread_mutex_unlock(&ui__lock);
}
-static struct ui_progress_ops tui_progress__ops =
+static struct ui_progress tui_progress_fns =
{
.update = tui_progress__update,
};
-void tui_progress__init(void)
+void ui_progress__init(void)
{
- ui_progress__ops = &tui_progress__ops;
+ progress_fns = &tui_progress_fns;
}
diff --git a/tools/perf/ui/tui/setup.c b/tools/perf/ui/tui/setup.c
index 2f61256..b940148 100644
--- a/tools/perf/ui/tui/setup.c
+++ b/tools/perf/ui/tui/setup.c
@@ -9,7 +9,6 @@
#include "../util.h"
#include "../libslang.h"
#include "../keysyms.h"
-#include "tui.h"
static volatile int ui__need_resize;
@@ -120,7 +119,7 @@ int ui__init(void)
ui_helpline__init();
ui_browser__init();
- tui_progress__init();
+ ui_progress__init();
signal(SIGSEGV, ui__signal);
signal(SIGFPE, ui__signal);
diff --git a/tools/perf/ui/tui/tui.h b/tools/perf/ui/tui/tui.h
deleted file mode 100644
index 18961c7..0000000
--- a/tools/perf/ui/tui/tui.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _PERF_TUI_H_
-#define _PERF_TUI_H_ 1
-
-void tui_progress__init(void);
-
-#endif /* _PERF_TUI_H_ */