From aca7a94d6a59d6bf2600768e752f971c6cc0ab57 Mon Sep 17 00:00:00 2001 From: Namhyung Kim Date: Wed, 4 Apr 2012 00:14:26 -0700 Subject: [PATCH] perf tools: Move UI bits to tools/perf/ui directory Move those files to new directory in order to be prepared to further UI work. Makefile and header file pathes are adjusted accordingly. Signed-off-by: Namhyung Kim Suggested-by: Arnaldo Carvalho de Melo Acked-by: Pekka Enberg Cc: Ingo Molnar Cc: Namhyung Kim Cc: Paul Mackerras Cc: Pekka Enberg Cc: Peter Zijlstra --- tools/perf/Makefile | 40 ++++++++++---------- tools/perf/{util => }/ui/browser.c | 0 tools/perf/{util => }/ui/browser.h | 0 tools/perf/{util => }/ui/browsers/annotate.c | 10 ++--- tools/perf/{util => }/ui/browsers/hists.c | 12 +++--- tools/perf/{util => }/ui/browsers/map.c | 6 +-- tools/perf/{util => }/ui/browsers/map.h | 0 tools/perf/{util => }/ui/helpline.c | 0 tools/perf/{util => }/ui/helpline.h | 0 tools/perf/{util => }/ui/keysyms.h | 0 tools/perf/{util => }/ui/libslang.h | 0 tools/perf/{util => }/ui/progress.c | 0 tools/perf/{util => }/ui/progress.h | 0 tools/perf/{util => }/ui/setup.c | 0 tools/perf/{util => }/ui/ui.h | 0 tools/perf/{util => }/ui/util.c | 0 tools/perf/{util => }/ui/util.h | 0 tools/perf/util/debug.h | 2 +- tools/perf/util/hist.h | 2 +- 19 files changed, 36 insertions(+), 36 deletions(-) rename tools/perf/{util => }/ui/browser.c (100%) rename tools/perf/{util => }/ui/browser.h (100%) rename tools/perf/{util => }/ui/browsers/annotate.c (99%) rename tools/perf/{util => }/ui/browsers/hists.c (99%) rename tools/perf/{util => }/ui/browsers/map.c (97%) rename tools/perf/{util => }/ui/browsers/map.h (100%) rename tools/perf/{util => }/ui/helpline.c (100%) rename tools/perf/{util => }/ui/helpline.h (100%) rename tools/perf/{util => }/ui/keysyms.h (100%) rename tools/perf/{util => }/ui/libslang.h (100%) rename tools/perf/{util => }/ui/progress.c (100%) rename tools/perf/{util => }/ui/progress.h (100%) rename tools/perf/{util => }/ui/setup.c (100%) rename tools/perf/{util => }/ui/ui.h (100%) rename tools/perf/{util => }/ui/util.c (100%) rename tools/perf/{util => }/ui/util.h (100%) diff --git a/tools/perf/Makefile b/tools/perf/Makefile index b28b61042fa8..af6ccf8d1499 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile @@ -473,22 +473,22 @@ else # Fedora has /usr/include/slang/slang.h, but ubuntu /usr/include/slang.h BASIC_CFLAGS += -I/usr/include/slang EXTLIBS += -lnewt -lslang - LIB_OBJS += $(OUTPUT)util/ui/setup.o - LIB_OBJS += $(OUTPUT)util/ui/browser.o - LIB_OBJS += $(OUTPUT)util/ui/browsers/annotate.o - LIB_OBJS += $(OUTPUT)util/ui/browsers/hists.o - LIB_OBJS += $(OUTPUT)util/ui/browsers/map.o - LIB_OBJS += $(OUTPUT)util/ui/helpline.o - LIB_OBJS += $(OUTPUT)util/ui/progress.o - LIB_OBJS += $(OUTPUT)util/ui/util.o - LIB_H += util/ui/browser.h - LIB_H += util/ui/browsers/map.h - LIB_H += util/ui/helpline.h - LIB_H += util/ui/keysyms.h - LIB_H += util/ui/libslang.h - LIB_H += util/ui/progress.h - LIB_H += util/ui/util.h - LIB_H += util/ui/ui.h + LIB_OBJS += $(OUTPUT)ui/setup.o + LIB_OBJS += $(OUTPUT)ui/browser.o + LIB_OBJS += $(OUTPUT)ui/browsers/annotate.o + LIB_OBJS += $(OUTPUT)ui/browsers/hists.o + LIB_OBJS += $(OUTPUT)ui/browsers/map.o + LIB_OBJS += $(OUTPUT)ui/helpline.o + LIB_OBJS += $(OUTPUT)ui/progress.o + LIB_OBJS += $(OUTPUT)ui/util.o + LIB_H += ui/browser.h + LIB_H += ui/browsers/map.h + LIB_H += ui/helpline.h + LIB_H += ui/keysyms.h + LIB_H += ui/libslang.h + LIB_H += ui/progress.h + LIB_H += ui/util.h + LIB_H += ui/ui.h endif endif @@ -755,16 +755,16 @@ $(OUTPUT)util/exec_cmd.o: util/exec_cmd.c $(OUTPUT)PERF-CFLAGS $(OUTPUT)util/config.o: util/config.c $(OUTPUT)PERF-CFLAGS $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $< -$(OUTPUT)util/ui/browser.o: util/ui/browser.c $(OUTPUT)PERF-CFLAGS +$(OUTPUT)ui/browser.o: ui/browser.c $(OUTPUT)PERF-CFLAGS $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DENABLE_SLFUTURE_CONST $< -$(OUTPUT)util/ui/browsers/annotate.o: util/ui/browsers/annotate.c $(OUTPUT)PERF-CFLAGS +$(OUTPUT)ui/browsers/annotate.o: ui/browsers/annotate.c $(OUTPUT)PERF-CFLAGS $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DENABLE_SLFUTURE_CONST $< -$(OUTPUT)util/ui/browsers/hists.o: util/ui/browsers/hists.c $(OUTPUT)PERF-CFLAGS +$(OUTPUT)ui/browsers/hists.o: ui/browsers/hists.c $(OUTPUT)PERF-CFLAGS $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DENABLE_SLFUTURE_CONST $< -$(OUTPUT)util/ui/browsers/map.o: util/ui/browsers/map.c $(OUTPUT)PERF-CFLAGS +$(OUTPUT)ui/browsers/map.o: ui/browsers/map.c $(OUTPUT)PERF-CFLAGS $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DENABLE_SLFUTURE_CONST $< $(OUTPUT)util/rbtree.o: ../../lib/rbtree.c $(OUTPUT)PERF-CFLAGS diff --git a/tools/perf/util/ui/browser.c b/tools/perf/ui/browser.c similarity index 100% rename from tools/perf/util/ui/browser.c rename to tools/perf/ui/browser.c diff --git a/tools/perf/util/ui/browser.h b/tools/perf/ui/browser.h similarity index 100% rename from tools/perf/util/ui/browser.h rename to tools/perf/ui/browser.h diff --git a/tools/perf/util/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c similarity index 99% rename from tools/perf/util/ui/browsers/annotate.c rename to tools/perf/ui/browsers/annotate.c index c2cfeed3af19..4db5186472b5 100644 --- a/tools/perf/util/ui/browsers/annotate.c +++ b/tools/perf/ui/browsers/annotate.c @@ -1,13 +1,13 @@ -#include "../../util.h" +#include "../../util/util.h" #include "../browser.h" #include "../helpline.h" #include "../libslang.h" #include "../ui.h" #include "../util.h" -#include "../../annotate.h" -#include "../../hist.h" -#include "../../sort.h" -#include "../../symbol.h" +#include "../../util/annotate.h" +#include "../../util/hist.h" +#include "../../util/sort.h" +#include "../../util/symbol.h" #include #include diff --git a/tools/perf/util/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c similarity index 99% rename from tools/perf/util/ui/browsers/hists.c rename to tools/perf/ui/browsers/hists.c index 1b820ed2a049..466827e91b87 100644 --- a/tools/perf/util/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@ -5,12 +5,12 @@ #include #include -#include "../../evsel.h" -#include "../../evlist.h" -#include "../../hist.h" -#include "../../pstack.h" -#include "../../sort.h" -#include "../../util.h" +#include "../../util/evsel.h" +#include "../../util/evlist.h" +#include "../../util/hist.h" +#include "../../util/pstack.h" +#include "../../util/sort.h" +#include "../../util/util.h" #include "../browser.h" #include "../helpline.h" diff --git a/tools/perf/util/ui/browsers/map.c b/tools/perf/ui/browsers/map.c similarity index 97% rename from tools/perf/util/ui/browsers/map.c rename to tools/perf/ui/browsers/map.c index eca6575abfd0..98851d55a53e 100644 --- a/tools/perf/util/ui/browsers/map.c +++ b/tools/perf/ui/browsers/map.c @@ -5,9 +5,9 @@ #include #include #include -#include "../../util.h" -#include "../../debug.h" -#include "../../symbol.h" +#include "../../util/util.h" +#include "../../util/debug.h" +#include "../../util/symbol.h" #include "../browser.h" #include "../helpline.h" #include "map.h" diff --git a/tools/perf/util/ui/browsers/map.h b/tools/perf/ui/browsers/map.h similarity index 100% rename from tools/perf/util/ui/browsers/map.h rename to tools/perf/ui/browsers/map.h diff --git a/tools/perf/util/ui/helpline.c b/tools/perf/ui/helpline.c similarity index 100% rename from tools/perf/util/ui/helpline.c rename to tools/perf/ui/helpline.c diff --git a/tools/perf/util/ui/helpline.h b/tools/perf/ui/helpline.h similarity index 100% rename from tools/perf/util/ui/helpline.h rename to tools/perf/ui/helpline.h diff --git a/tools/perf/util/ui/keysyms.h b/tools/perf/ui/keysyms.h similarity index 100% rename from tools/perf/util/ui/keysyms.h rename to tools/perf/ui/keysyms.h diff --git a/tools/perf/util/ui/libslang.h b/tools/perf/ui/libslang.h similarity index 100% rename from tools/perf/util/ui/libslang.h rename to tools/perf/ui/libslang.h diff --git a/tools/perf/util/ui/progress.c b/tools/perf/ui/progress.c similarity index 100% rename from tools/perf/util/ui/progress.c rename to tools/perf/ui/progress.c diff --git a/tools/perf/util/ui/progress.h b/tools/perf/ui/progress.h similarity index 100% rename from tools/perf/util/ui/progress.h rename to tools/perf/ui/progress.h diff --git a/tools/perf/util/ui/setup.c b/tools/perf/ui/setup.c similarity index 100% rename from tools/perf/util/ui/setup.c rename to tools/perf/ui/setup.c diff --git a/tools/perf/util/ui/ui.h b/tools/perf/ui/ui.h similarity index 100% rename from tools/perf/util/ui/ui.h rename to tools/perf/ui/ui.h diff --git a/tools/perf/util/ui/util.c b/tools/perf/ui/util.c similarity index 100% rename from tools/perf/util/ui/util.c rename to tools/perf/ui/util.c diff --git a/tools/perf/util/ui/util.h b/tools/perf/ui/util.h similarity index 100% rename from tools/perf/util/ui/util.h rename to tools/perf/ui/util.h diff --git a/tools/perf/util/debug.h b/tools/perf/util/debug.h index f2ce88d04f54..6bebe7f0a20c 100644 --- a/tools/perf/util/debug.h +++ b/tools/perf/util/debug.h @@ -26,7 +26,7 @@ static inline void ui_progress__update(u64 curr __used, u64 total __used, #else extern char ui_helpline__last_msg[]; int ui_helpline__show_help(const char *format, va_list ap); -#include "ui/progress.h" +#include "../ui/progress.h" int ui__error(const char *format, ...) __attribute__((format(printf, 1, 2))); #endif diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h index 2cae9df40e04..cfc64e293f90 100644 --- a/tools/perf/util/hist.h +++ b/tools/perf/util/hist.h @@ -138,7 +138,7 @@ static inline int hist_entry__tui_annotate(struct hist_entry *self __used, #define K_LEFT -1 #define K_RIGHT -2 #else -#include "ui/keysyms.h" +#include "../ui/keysyms.h" int hist_entry__tui_annotate(struct hist_entry *he, int evidx, void(*timer)(void *arg), void *arg, int delay_secs);