Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1fe143c5 authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Move term functions out of util.c 



The term functions are needed by help.c which is going to be moved into
a separate library.  Move them out of util.c and into their own file.

Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/9a39c854dd156b55ebda57e427594c9a59dcb40f.1449548395.git.jpoimboe@redhat.com


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

tools/perf/util/Build

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ libperf-$(CONFIG_AUXTRACE) += intel-pt.o 
libperf-$(CONFIG_AUXTRACE) += intel-bts.o

libperf-y += parse-branch-options.o

libperf-y += parse-regs-options.o

libperf-y += term.o



libperf-$(CONFIG_LIBBPF) += bpf-loader.o

libperf-$(CONFIG_BPF_PROLOGUE) += bpf-prologue.o

tools/perf/util/term.c

0 → 100644
+35 −0
Original line number Diff line number Diff line 
#include "util.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;

}



void set_term_quiet_input(struct termios *old)

{

	struct termios tc;



	tcgetattr(0, old);

	tc = *old;

	tc.c_lflag &= ~(ICANON | ECHO);

	tc.c_cc[VMIN] = 0;

	tc.c_cc[VTIME] = 0;

	tcsetattr(0, TCSANOW, &tc);

}

tools/perf/util/term.h

0 → 100644
+10 −0
Original line number Diff line number Diff line 
#ifndef __PERF_TERM_H

#define __PERF_TERM_H



struct termios;

struct winsize;



void get_term_dimensions(struct winsize *ws);

void set_term_quiet_input(struct termios *old);



#endif /* __PERF_TERM_H */

tools/perf/util/util.c

+0 −34
Original line number Diff line number Diff line
@@ -355,40 +355,6 @@ void sighandler_dump_stack(int sig) 
	exit(sig);

}



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;

}



void set_term_quiet_input(struct termios *old)

{

	struct termios tc;



	tcgetattr(0, old);

	tc = *old;

	tc.c_lflag &= ~(ICANON | ECHO);

	tc.c_cc[VMIN] = 0;

	tc.c_cc[VTIME] = 0;

	tcsetattr(0, TCSANOW, &tc);

}



int parse_nsec_time(const char *str, u64 *ptime)

{

	u64 time_sec, time_nsec;

tools/perf/util/util.h

+1 −3
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#include <stdlib.h>

#include <stdarg.h>

#include <string.h>

#include <term.h>

#include <errno.h>

#include <limits.h>

#include <sys/param.h>
@@ -282,9 +283,6 @@ void sighandler_dump_stack(int sig); 
extern unsigned int page_size;

extern int cacheline_size;



void get_term_dimensions(struct winsize *ws);

void set_term_quiet_input(struct termios *old);



struct parse_tag {

	char tag;

	int mult;