Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuil...

[net-next-2.6.git] / tools / perf / util / newt.c

diff --git a/tools/perf/util/newt.c b/tools/perf/util/newt.c
index d54c540f49dbd4902808aaf8b466f3a88e3606bd..7537ca15900b121852cc19545fe45a2b266403f7 100644 (file)
--- a/tools/perf/util/newt.c
+++ b/tools/perf/util/newt.c
@@ -43,6 +43,9 @@ struct ui_progress *ui_progress__new(const char *title, u64 total)
 
        if (self != NULL) {
                int cols;
+
+               if (use_browser <= 0)   
+                       return self;
                newtGetScreenSize(&cols, NULL);
                cols -= 4;
                newtCenteredWindow(cols, 1, title);
@@ -67,14 +70,22 @@ out_free_self:
 
 void ui_progress__update(struct ui_progress *self, u64 curr)
 {
+       /*
+        * FIXME: We should have a per UI backend way of showing progress,
+        * stdio will just show a percentage as NN%, etc.
+        */
+       if (use_browser <= 0)
+               return;
        newtScaleSet(self->scale, curr);
        newtRefresh();
 }
 
 void ui_progress__delete(struct ui_progress *self)
 {
-       newtFormDestroy(self->form);
-       newtPopWindow();
+       if (use_browser > 0) {
+               newtFormDestroy(self->form);
+               newtPopWindow();
+       }
        free(self);
 }
 
@@ -1139,6 +1150,7 @@ void setup_browser(void)
        struct newtPercentTreeColors *c = &defaultPercentTreeColors;
 
        if (!isatty(1) || !use_browser || dump_trace) {
+               use_browser = 0;
                setup_pager();
                return;
        }