Commit 2c803e52 authored by David Ahern's avatar David Ahern Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Move get_term_dimensions from top to util.c 



It is used by util/help.c so it should be a lib function and included in
libperf.a. Code move only.

Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Link: http://lkml.kernel.org/r/1358185681-90926-1-git-send-email-dsahern@gmail.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent b7c14a0b

tools/perf/builtin-top.c

+0 −22
Original line number Diff line number Diff line
@@ -68,28 +68,6 @@ 
#include <linux/unistd.h>

#include <linux/types.h>



void get_term_dimensions(struct winsize *ws)

{

	char *s = getenv("LINES");



	if (s != NULL) {

		ws->ws_row = atoi(s);

		s = getenv("COLUMNS");

		if (s != NULL) {

			ws->ws_col = atoi(s);

			if (ws->ws_row && ws->ws_col)

				return;

		}

	}

#ifdef TIOCGWINSZ

	if (ioctl(1, TIOCGWINSZ, ws) == 0 &&

	    ws->ws_row && ws->ws_col)

		return;

#endif

	ws->ws_row = 25;

	ws->ws_col = 80;

}



static void perf_top__update_print_entries(struct perf_top *top)

{

	if (top->print_entries > 9)

tools/perf/perf.h

+0 −4
Original line number Diff line number Diff line 
#ifndef _PERF_PERF_H

#define _PERF_PERF_H



struct winsize;



void get_term_dimensions(struct winsize *ws);



#include <asm/unistd.h>



#if defined(__i386__)

tools/perf/util/util.c

+22 −0
Original line number Diff line number Diff line
@@ -220,3 +220,25 @@ void dump_stack(void) 
#else

void dump_stack(void) {}

#endif



void get_term_dimensions(struct winsize *ws)

{

	char *s = getenv("LINES");



	if (s != NULL) {

		ws->ws_row = atoi(s);

		s = getenv("COLUMNS");

		if (s != NULL) {

			ws->ws_col = atoi(s);

			if (ws->ws_row && ws->ws_col)

				return;

		}

	}

#ifdef TIOCGWINSZ

	if (ioctl(1, TIOCGWINSZ, ws) == 0 &&

	    ws->ws_row && ws->ws_col)

		return;

#endif

	ws->ws_row = 25;

	ws->ws_col = 80;

}

tools/perf/util/util.h

+3 −0
Original line number Diff line number Diff line
@@ -271,4 +271,7 @@ void dump_stack(void); 


extern unsigned int page_size;



struct winsize;

void get_term_dimensions(struct winsize *ws);



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE