emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

slabtop: for run_once switch (-o), output all slabinfo

Browse Source 
It doesn't make sense to restrict the number of output
lines to the total of terminal rows when using the run
once command line switch. And, in fact, that's how the
newlib version of slabtop works. Everything is output.

So, this commit places both versions on equal footing.

[ it was even worse if the switch was used in a pipe ]
[ since only 23 lines would have then been displayed ]

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2017-11-27 00:00:00 -06:00 committed by Craig Small
parent 18e5aecd2b
commit 0ef497bb35
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slabtop.c
View File

@ -21,6 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <limits.h>
#include <locale.h> #include <locale.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
@ -47,6 +48,7 @@
#define DEF_SORT_FUNC sort_nr_objs #define DEF_SORT_FUNC sort_nr_objs
static int run_once;
static unsigned short cols, rows; static unsigned short cols, rows;
static struct termios saved_tty; static struct termios saved_tty;
static long delay = 3; static long delay = 3;
@ -176,6 +178,8 @@ static void term_size(int unusused __attribute__ ((__unused__)))
cols = 80; cols = 80;
rows = 24; rows = 24;
} }
if (run_once)
rows = USHRT_MAX;
} }
static void sigint_handler(int unused __attribute__ ((__unused__))) static void sigint_handler(int unused __attribute__ ((__unused__)))
@ -289,7 +293,7 @@ int main(int argc, char *argv[])
int is_tty, o; int is_tty, o;
unsigned short old_rows; unsigned short old_rows;
struct slab_info *slab_list = NULL; struct slab_info *slab_list = NULL;
int run_once = 0, retval = EXIT_SUCCESS; int retval = EXIT_SUCCESS;
static const struct option longopts[] = { static const struct option longopts[] = {
{ "delay", required_argument, NULL, 'd' }, { "delay", required_argument, NULL, 'd' },