Em Wed, Mar 11, 2015 at 09:58:50AM +0100, Jiri Olsa escreveu:
> Remove libbabeltrace check from default features set, because the
> requested version is not released yet in most distributions. We'll
> enable later.
>
> Calling libbabeltrace check manually via feature_check
> before $(feature-libbabeltrace) is used.
So, before this patch:
[acme@ssdandy perf]$ make
BUILD: Doing 'make -j8' parallel build
config/Makefile:425: No libunwind found. Please install libunwind-dev[el] >=
1.1 and/or set LIBUNWIND_DIR
config/Makefile:709: No libbabeltrace found, disables 'perf data' CTF format
support, please install libbabeltrace-dev[el]/libbabeltrace-ctf-dev
Auto-detecting system features:
... dwarf: [ on ]
... glibc: [ on ]
... gtk2: [ on ]
... libaudit: [ on ]
... libbfd: [ on ]
... libelf: [ on ]
... libnuma: [ on ]
... libperl: [ on ]
... libpython: [ on ]
... libslang: [ on ]
... libunwind: [ OFF ]
... libdw-dwarf-unwind: [ on ]
... libbabeltrace: [ OFF ]
... zlib: [ on ]
... DWARF post unwind library: libdw
It tries to build babeltrace in, does not find the devel files, emits that "No
libbabeltrace found"
and then marks it as OFF, ok.
Now, I am ok with the intent of this patch, but... After applying it we get:
[acme@ssdandy linux]$ cd -
/home/acme/git/linux/tools/perf
[acme@ssdandy perf]$
[acme@ssdandy perf]$ make
BUILD: Doing 'make -j8' parallel build
config/Makefile:423: No libunwind found. Please install libunwind-dev[el] >=
1.1 and/or set LIBUNWIND_DIR
config/Makefile:713: No libbabeltrace found, disables 'perf data' CTF format
support, please install libbabeltrace-dev[el]/libbabeltrace-ctf-dev
Auto-detecting system features:
... dwarf: [ on ]
... glibc: [ on ]
... gtk2: [ on ]
... libaudit: [ on ]
... libbfd: [ on ]
... libelf: [ on ]
... libnuma: [ on ]
... libperl: [ on ]
... libpython: [ on ]
... libslang: [ on ]
... libunwind: [ OFF ]
... libdw-dwarf-unwind: [ on ]
... zlib: [ on ]
... DWARF post unwind library: libdw
GEN common-cmds.h
It continues trying to find babeltrace, does not find it, emits the warning and
just doesn't show the OFF message :-\
Can you explain _why_ this is needed? I.e. is it to speed up feature checking?
In what way, etc. For casual readers the intent of this patch may be difficult
to grasp, no?
What am I missing?
- Arnaldo
> Signed-off-by: Jiri Olsa <jo...@kernel.org>
> Acked-by: Ingo Molnar <mi...@kernel.org>
> Cc: Arnaldo Carvalho de Melo <a...@redhat.com>
> Cc: Corey Ashford <cjash...@linux.vnet.ibm.com>
> Cc: David Ahern <david.ah...@oracle.com>
> Cc: Ingo Molnar <mi...@kernel.org>
> Cc: Namhyung Kim <namhy...@kernel.org>
> Cc: Paul Mackerras <pau...@samba.org>
> Cc: Peter Zijlstra <pet...@infradead.org>
> ---
> tools/perf/config/Makefile | 11 +++++------
> tools/perf/config/feature-checks/Makefile | 2 +-
> tools/perf/config/feature-checks/test-all.c | 9 ++++++++-
> 3 files changed, 14 insertions(+), 8 deletions(-)
>
> diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
> index d44c64d64465..45f61253ccce 100644
> --- a/tools/perf/config/Makefile
> +++ b/tools/perf/config/Makefile
> @@ -227,7 +227,6 @@ CORE_FEATURE_TESTS = \
> stackprotector-all \
> timerfd \
> libdw-dwarf-unwind \
> - libbabeltrace \
> zlib
>
> LIB_FEATURE_TESTS = \
> @@ -243,7 +242,6 @@ LIB_FEATURE_TESTS = \
> libslang \
> libunwind \
> libdw-dwarf-unwind \
> - libbabeltrace \
> zlib
>
> VF_FEATURE_TESTS = \
> @@ -705,14 +703,15 @@ else
> endif
>
> ifndef NO_LIBBABELTRACE
> - ifeq ($(feature-libbabeltrace), 0)
> - msg := $(warning No libbabeltrace found, disables 'perf data' CTF format
> support, please install libbabeltrace-dev[el]/libbabeltrace-ctf-dev);
> - NO_LIBBABELTRACE := 1
> - else
> + $(call feature_check,libbabeltrace)
> + ifeq ($(feature-libbabeltrace), 1)
> CFLAGS += -DHAVE_LIBBABELTRACE_SUPPORT $(LIBBABELTRACE_CFLAGS)
> LDFLAGS += $(LIBBABELTRACE_LDFLAGS)
> EXTLIBS += -lbabeltrace-ctf
> $(call detected,CONFIG_LIBBABELTRACE)
> + else
> + msg := $(warning No libbabeltrace found, disables 'perf data' CTF format
> support, please install libbabeltrace-dev[el]/libbabeltrace-ctf-dev);
> + NO_LIBBABELTRACE := 1
> endif
> endif
>
> diff --git a/tools/perf/config/feature-checks/Makefile
> b/tools/perf/config/feature-checks/Makefile
> index 8fe067864957..b6e2e312ba54 100644
> --- a/tools/perf/config/feature-checks/Makefile
> +++ b/tools/perf/config/feature-checks/Makefile
> @@ -44,7 +44,7 @@ BUILD = $(CC) $(CFLAGS) -Wall -Werror -o $(OUTPUT)$@
> $(patsubst %.bin,%.c,$@) $(
> ###############################
>
> test-all.bin:
> - $(BUILD) -fstack-protector-all -O2 -D_FORTIFY_SOURCE=2 -ldw -lelf
> -lnuma -lelf -laudit -I/usr/include/slang -lslang $(shell $(PKG_CONFIG)
> --libs --cflags gtk+-2.0 2>/dev/null) $(FLAGS_PERL_EMBED)
> $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl -lz -lbabeltrace
> + $(BUILD) -fstack-protector-all -O2 -D_FORTIFY_SOURCE=2 -ldw -lelf
> -lnuma -lelf -laudit -I/usr/include/slang -lslang $(shell $(PKG_CONFIG)
> --libs --cflags gtk+-2.0 2>/dev/null) $(FLAGS_PERL_EMBED)
> $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl -lz
>
> test-hello.bin:
> $(BUILD)
> diff --git a/tools/perf/config/feature-checks/test-all.c
> b/tools/perf/config/feature-checks/test-all.c
> index 1ffc3da5ca10..06f5c8a67cb2 100644
> --- a/tools/perf/config/feature-checks/test-all.c
> +++ b/tools/perf/config/feature-checks/test-all.c
> @@ -101,9 +101,17 @@
> # include "test-pthread_attr_setaffinity_np.c"
> #undef main
>
> +# if 0
> +/*
> + * Disable libbabeltrace check for test-all, because the requested
> + * library version is not released yet in most distributions. Will
> + * reenable later.
> + */
> +
> #define main main_test_libbabeltrace
> # include "test-libbabeltrace.c"
> #undef main
> +#endif
>
> int main(int argc, char *argv[])
> {
> @@ -130,7 +138,6 @@ int main(int argc, char *argv[])
> main_test_sync_compare_and_swap(argc, argv);
> main_test_zlib();
> main_test_pthread_attr_setaffinity_np();
> - main_test_libbabeltrace();
>
> return 0;
> }
> --
> 1.9.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
