Skip to contentSkip to conversation

perf: move get_term_dimensions from top to util.c

PATCH In review David Ahern 1 participant 2 messages Jan 14, 2013 – Jan 25, 2013 perf events

lore
Share & tools
lore

David Ahern

author
#0 lore raw

PATCH 1/1 perf: 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 David Ahern <[email protected]>
---
 tools/perf/builtin-top.c |   22 ----------------------
 tools/perf/perf.h        |    4 ----
 tools/perf/util/util.c   |   22 ++++++++++++++++++++++
 tools/perf/util/util.h   |    3 +++
 4 files changed, 25 insertions(+), 26 deletions(-)
tools/perf/builtin-top.c +0 -22
index c9ff395..471efaa 100644
@@ -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
index 2c340e7..ec1eace 100644
@@ -1,10 +1,6 @@
 #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
index 5906e84..1e32d8b 100644
@@ -218,3 +218,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
index c233091..ec5de5e 100644
@@ -271,4 +271,7 @@ void dump_stack(void);
 
 extern unsigned int page_size;
 
+struct winsize;
+void get_term_dimensions(struct winsize *ws);
+
 #endif
Signature · 1 line
1.7.10.1
author
#1 lore raw

[tip:perf/core] perf tools: Move get_term_dimensions from top to util.c

Commit-ID:  2c803e5248d038988ec7c52e8fd7c83130dd3c13
Gitweb:     http://git.kernel.org/tip/2c803e5248d038988ec7c52e8fd7c83130dd3c13
Author:     David Ahern <[email protected]>
AuthorDate: Mon, 14 Jan 2013 10:48:01 -0700
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 24 Jan 2013 16:40:34 -0300

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 David Ahern <[email protected]>
Link http://lkml.kernel.org/r/[email protected] open here
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
---
 tools/perf/builtin-top.c | 22 ----------------------
 tools/perf/perf.h        |  4 ----
 tools/perf/util/util.c   | 22 ++++++++++++++++++++++
 tools/perf/util/util.h   |  3 +++
 4 files changed, 25 insertions(+), 26 deletions(-)
tools/perf/builtin-top.c +0 -22
index bc78812..e05ba81 100644
@@ -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
index 7622f15..8f3bf38 100644
@@ -1,10 +1,6 @@
 #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
index 252b889..805d1f5 100644
@@ -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
index c233091..ec5de5e 100644
@@ -271,4 +271,7 @@ void dump_stack(void);
 
 extern unsigned int page_size;
 
+struct winsize;
+void get_term_dimensions(struct winsize *ws);
+
 #endif