Merge branch 'tui-support'

Add initial support for interactive 'tui' command using ncurses.  The
tui command will provide similar (or better) functionality of graph and
report commands.  Users can navigate the data interactively in a text
console.

Closes: #326

Signed-off-by: Namhyung Kim <namhyung@gmail.com>

INSTALL.md

@@ -7,6 +7,7 @@ source.
     $ sudo apt-get install libelf-dev           # mandatory
     $ sudo apt-get install pandoc               # for man pages (optional)
     $ sudo apt-get install libpython2.7-dev     # for python scripting (optional)
+    $ sudo apt-get install libncursesw5-dev     # for TUI (optional)
     $ make
     $ sudo make install
 
@@ -36,7 +37,8 @@ On redhat based systems (like Fedora, RHEL), it'll be `elfutils-libelf-devel`.
     $ sudo dnf install elfutils-libelf-devel
 
 It also uses libstdc++ library to demangle C++ symbols in full detail.
-But it's not mandatory as uftrace has its own demangler for shorter symbol
+And ncursesw library to implement text user interface (TUI) on console.
+But they're not mandatory as uftrace has its own demangler for shorter symbol
 name (it omits arguments, templates and so on).
 
 Also it needs `pandoc` to build man pages from the markdown document.

README.md

@@ -52,12 +52,13 @@ The uftrace command has following subcommands:
  * `recv`   : saves the trace data from network
  * `graph`  : shows function call graph in the trace data
  * `script` : runs a script for recorded trace data
+ * `tui`    : show text user interface for graph and report
 
 You can use `-?` or `--help` option to see available commands and options.
 
     $ uftrace
     Usage: uftrace [OPTION...]
-                [record|replay|live|report|info|dump|recv|graph|script] [<program>]
+                [record|replay|live|report|info|dump|recv|graph|script|tui] [<program>]
     Try `uftrace --help' or `uftrace --usage' for more information.
 
 If omitted, it defaults to the `live` command which is almost same as running

check-deps/Makefile

@@ -7,6 +7,7 @@ CHECK_LIST += have_libpython2.7
 CHECK_LIST += perf_clockid
 CHECK_LIST += perf_context_switch
 CHECK_LIST += arm_has_hardfp
+CHECK_LIST += have_libncurses
 
 #
 # This is needed for checking build dependency
@@ -20,6 +21,8 @@ LDFLAGS_cxa_demangle = -lstdc++
 LDFLAGS_have_libelf = -lelf
 CFLAGS_cc_has_mno_sse2 = -mno-sse2
 LDFLAGS_have_libpython2.7 = -lpython2.7
+CFLAGS_have_libncurses = $(shell pkg-config --cflags ncursesw)
+LDFLAGS_have_libncurses = $(shell pkg-config --libs ncursesw)
 
 check-build: check-tstamp $(CHECK_LIST)
 

check-deps/Makefile.check

@@ -30,3 +30,8 @@ endif
 ifneq ($(wildcard $(srcdir)/check-deps/arm_has_hardfp),)
   COMMON_CFLAGS += -DHAVE_ARM_HARDFP
 endif
+
+ifneq ($(wildcard $(srcdir)/check-deps/have_libncurses),)
+  COMMON_CFLAGS += -DHAVE_LIBNCURSES $(shell pkg-config --cflags ncursesw)
+  UFTRACE_LDFLAGS += $(shell pkg-config --libs ncursesw)
+endif

check-deps/__have_libncurses.c

@@ -0,0 +1,8 @@
+#include <ncurses.h>
+
+int main(void)
+{
+	initscr();
+	endwin();
+	return 0;
+}

cmd-dump.c

@@ -1127,7 +1127,7 @@ static void print_flame_task_rstack(struct uftrace_dump_ops *ops,
 	if (graph->node == NULL)
 		graph->node = &flame_graph.root;
 
-	graph_add_node(graph, frs->type, name);
+	graph_add_node(graph, frs->type, name, sizeof(struct uftrace_graph_node));
 }
 
 static void print_flame_task_event(struct uftrace_dump_ops *ops,

cmd-graph.c

@@ -454,8 +454,10 @@ static void build_graph_node(struct ftrace_task_handle *task, uint64_t time,
 	sym = find_symtabs(&tg->utg.graph->sess->symtabs, addr);
 	name = symbol_getname(sym, addr);
 
-	if (tg->enabled)
-		graph_add_node(&tg->utg, type, name);
+	if (tg->enabled) {
+		graph_add_node(&tg->utg, type, name,
+			       sizeof(struct uftrace_graph_node));
+	}
 
 	/* cannot find a session for this record */
 	if (tg->utg.graph == NULL)