irqtop: add batch mode support

Add batch mode support, which could be useful for sending output to
other programs or to a file.

Signed-off-by: Joe Jin <joe.jin@oracle.com>
Cc: Zhenwei Pi <pizhenwei@bytedance.com>
Cc: Sami Kerola <kerolasa@iki.fi>
Cc: Karel Zak <kzak@redhat.com>

diff --git a/bash-completion/irqtop b/bash-completion/irqtop
index b9e454d4cb270389e6a61dcdfd094408dbc43af0..215281ee8c426050c138b16c41cf9bfdc4d53d69 100644 (file)
--- a/bash-completion/irqtop
+++ b/bash-completion/irqtop
@@ -5,6 +5,9 @@ _irqtop_module()
        cur="${COMP_WORDS[COMP_CWORD]}"
        prev="${COMP_WORDS[COMP_CWORD-1]}"
        case $prev in
+               '-b'|'--batch')
+                       return 0
+                       ;;
                '-c'|'--cpu-stat')
                        COMPREPLY=( $(compgen -W "auto enable disable" -- $cur) )
                        return 0
@@ -40,7 +43,8 @@ _irqtop_module()
                        return 0
                        ;;
        esac
-       OPTS="  --cpu-stat
+       OPTS="  --batch
+               --cpu-stat
                --cpu-list
                --delay
                --sort

diff --git a/sys-utils/irqtop.1.adoc b/sys-utils/irqtop.1.adoc
index 443e23b84368907fa5c92f97a0f6b4d94f16a9cb..e81f4fbb6b6a4cf2872a5f151b6a682de82c2723 100644 (file)
--- a/sys-utils/irqtop.1.adoc
+++ b/sys-utils/irqtop.1.adoc
@@ -25,6 +25,9 @@ The default output is subject to change. So whenever possible, you should avoid
 *-o*, *--output* _list_::
 Specify which output columns to print. Use *--help* to get a list of all supported columns. The default list of columns may be extended if list is specified in the format _+list_.
 
+*-b*, *--batch*::
+Starts irqtop in batch mode, which could be useful for sending output to other programs or to a file.
+
 *-c*, *--cpu-stat* _mode_::
 Show per-cpu statistics by specified mode. Available modes are: *auto*, *enable*, *disable*. The default option *auto* detects the width of window, then shows the per-cpu statistics if the width of window is large enough to show a full line of statistics.
 

diff --git a/sys-utils/irqtop.c b/sys-utils/irqtop.c
index 8fbedb16ab3206a0672f92f85a3ace5fedae1341..81a137be07bc019182241e9b52008c5666164191 100644 (file)
--- a/sys-utils/irqtop.c
+++ b/sys-utils/irqtop.c
@@ -83,10 +83,32 @@ struct irqtop_ctl {
        cpu_set_t *cpuset;
 
        enum irqtop_cpustat_mode cpustat_mode;
+       bool    batch;
        bool    request_exit,
                softirq;
 };
 
+static inline int irqtop_printf(struct irqtop_ctl *ctl, const char *fmt, ...)
+{
+       int ret = 0;
+       va_list args;
+
+       if (!ctl)
+               return -1;
+
+       va_start(args, fmt);
+       if (ctl->batch)
+               ret = vprintf(fmt, args);
+       else
+               ret = vw_printw(ctl->win, fmt, args);
+       va_end(args);
+
+       if (!ctl->batch && ret == OK)
+               wrefresh(ctl->win);
+
+       return ret;
+}
+
 /* user's input parser */
 static void parse_input(struct irqtop_ctl *ctl, struct irq_output *out, char c)
 {
@@ -128,16 +150,19 @@ static int update_screen(struct irqtop_ctl *ctl, struct irq_output *out)
                        scols_table_enable_nowrap(cpus, 1);
        }
 
-       /* print header */
-       move(0, 0);
        strtime_iso(&now, ISO_TIMESTAMP, timestr, sizeof(timestr));
-       wprintw(ctl->win, _("irqtop | total: %ld delta: %ld | %s | %s\n\n"),
+       if (!ctl->batch)
+               move(0, 0);
+
+       /* print header */
+       irqtop_printf(ctl, _("irqtop | total: %ld delta: %ld | %s | %s\n\n"),
                           stat->total_irq, stat->delta_irq, ctl->hostname, timestr);
 
+
        /* print cpus table or not by -c option */
        if (cpus) {
                scols_print_table_to_string(cpus, &data);
-               wprintw(ctl->win, "%s\n\n", data);
+               irqtop_printf(ctl, "%s\n\n", data);
                free(data);
        }
 
@@ -149,13 +174,15 @@ static int update_screen(struct irqtop_ctl *ctl, struct irq_output *out)
        if (p) {
                /* print header in reverse mode */
                *p = '\0';
-               attron(A_REVERSE);
-               wprintw(ctl->win, "%s\n", data);
-               attroff(A_REVERSE);
+               if (!ctl->batch)
+                       attron(A_REVERSE);
+               irqtop_printf(ctl, "%s\n", data);
+               if (!ctl->batch)
+                       attroff(A_REVERSE);
                data = p + 1;
        }
 
-       wprintw(ctl->win, "%s", data);
+       irqtop_printf(ctl, "%s\n\n", data);
        free(data0);
 
        /* clean up */
@@ -212,7 +239,8 @@ static int event_loop(struct irqtop_ctl *ctl, struct irq_output *out)
                err(EXIT_FAILURE, _("epoll_ctl failed"));
 
        retval |= update_screen(ctl, out);
-       refresh();
+       if (!ctl->batch)
+               refresh();
 
        while (!ctl->request_exit) {
                const ssize_t nr_events = epoll_wait(efd, events, MAX_EVENTS, -1);
@@ -227,10 +255,12 @@ static int event_loop(struct irqtop_ctl *ctl, struct irq_output *out)
                                        continue;
                                }
                                if (siginfo.ssi_signo == SIGWINCH) {
-                                       get_terminal_dimension(&ctl->cols, &ctl->rows);
+                                       if (!ctl->batch) {
+                                               get_terminal_dimension(&ctl->cols, &ctl->rows);
 #if HAVE_RESIZETERM
-                                       resizeterm(ctl->rows, ctl->cols);
+                                               resizeterm(ctl->rows, ctl->cols);
 #endif
+                                       }
                                }
                                else {
                                        ctl->request_exit = 1;
@@ -245,7 +275,8 @@ static int event_loop(struct irqtop_ctl *ctl, struct irq_output *out)
                        } else
                                abort();
                        retval |= update_screen(ctl, out);
-                       refresh();
+                       if (!ctl->batch)
+                               refresh();
                }
        }
        return retval;
@@ -260,6 +291,7 @@ static void __attribute__((__noreturn__)) usage(void)
        puts(_("Interactive utility to display kernel interrupt information."));
 
        fputs(USAGE_OPTIONS, stdout);
+       fputs(_(" -b, --batch batch mode\n"), stdout);
        fputs(_(" -c, --cpu-stat <mode> show per-cpu stat (auto, enable, disable)\n"), stdout);
        fputs(_(" -C, --cpu-list <list> specify cpus in list format\n"), stdout);
        fputs(_(" -d, --delay <secs>   delay updates\n"), stdout);
@@ -291,6 +323,7 @@ static void parse_args(     struct irqtop_ctl *ctl,
 {
        const char *outarg = NULL;
        static const struct option longopts[] = {
+               {"batch", no_argument, NULL, 'b'},
                {"cpu-stat", required_argument, NULL, 'c'},
                {"cpu-list", required_argument, NULL, 'C'},
                {"delay", required_argument, NULL, 'd'},
@@ -304,8 +337,11 @@ static void parse_args(    struct irqtop_ctl *ctl,
        };
        int o;
 
-       while ((o = getopt_long(argc, argv, "c:C:d:o:s:St:hV", longopts, NULL)) != -1) {
+       while ((o = getopt_long(argc, argv, "bc:C:d:o:s:St:hV", longopts, NULL)) != -1) {
                switch (o) {
+               case 'b':
+                       ctl->batch = 1;
+                       break;
                case 'c':
                        if (!strcmp(optarg, "auto"))
                                ctl->cpustat_mode = IRQTOP_CPUSTAT_AUTO;
@@ -394,16 +430,18 @@ int main(int argc, char **argv)
 
        parse_args(&ctl, &out, argc, argv);
 
-       is_tty = isatty(STDIN_FILENO);
-       if (is_tty && tcgetattr(STDIN_FILENO, &saved_tty) == -1)
-               fputs(_("terminal setting retrieval"), stdout);
+       if (!ctl.batch) {
+               is_tty = isatty(STDIN_FILENO);
+               if (is_tty && tcgetattr(STDIN_FILENO, &saved_tty) == -1)
+                       fputs(_("terminal setting retrieval"), stdout);
 
-       ctl.win = initscr();
-       get_terminal_dimension(&ctl.cols, &ctl.rows);
+               ctl.win = initscr();
+               get_terminal_dimension(&ctl.cols, &ctl.rows);
 #if HAVE_RESIZETERM
-       resizeterm(ctl.rows, ctl.cols);
+               resizeterm(ctl.rows, ctl.cols);
 #endif
-       curs_set(0);
+               curs_set(0);
+       }
 
        ctl.hostname = xgethostname();
        event_loop(&ctl, &out);
@@ -412,10 +450,13 @@ int main(int argc, char **argv)
        free(ctl.hostname);
        cpuset_free(ctl.cpuset);
 
-       if (is_tty)
-               tcsetattr(STDIN_FILENO, TCSAFLUSH, &saved_tty);
-       delwin(ctl.win);
-       endwin();
+       if (!ctl.batch) {
+               if (is_tty)
+                       tcsetattr(STDIN_FILENO, TCSAFLUSH, &saved_tty);
+
+               delwin(ctl.win);
+               endwin();
+       }
 
        return EXIT_SUCCESS;
 }