perf tools: Get rid of on_exit() feature test
The on_exit() function was only used in perf record but it's gone in previous patch. Signed-off-by: Namhyung Kim <namhyung@kernel.org> Acked-by: Stephane Eranian <eranian@google.com> Cc: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> Cc: Irina Tirdea <irina.tirdea@intel.com> Link: http://lkml.kernel.org/r/1399855645-25815-2-git-send-email-namhyung@kernel.org Signed-off-by: Jiri Olsa <jolsa@kernel.org>
This commit is contained in:
parent
4560471053
commit
bac1e4d103
|
@ -30,37 +30,6 @@
|
||||||
#include <sched.h>
|
#include <sched.h>
|
||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
|
|
||||||
#ifndef HAVE_ON_EXIT_SUPPORT
|
|
||||||
#ifndef ATEXIT_MAX
|
|
||||||
#define ATEXIT_MAX 32
|
|
||||||
#endif
|
|
||||||
static int __on_exit_count = 0;
|
|
||||||
typedef void (*on_exit_func_t) (int, void *);
|
|
||||||
static on_exit_func_t __on_exit_funcs[ATEXIT_MAX];
|
|
||||||
static void *__on_exit_args[ATEXIT_MAX];
|
|
||||||
static int __exitcode = 0;
|
|
||||||
static void __handle_on_exit_funcs(void);
|
|
||||||
static int on_exit(on_exit_func_t function, void *arg);
|
|
||||||
#define exit(x) (exit)(__exitcode = (x))
|
|
||||||
|
|
||||||
static int on_exit(on_exit_func_t function, void *arg)
|
|
||||||
{
|
|
||||||
if (__on_exit_count == ATEXIT_MAX)
|
|
||||||
return -ENOMEM;
|
|
||||||
else if (__on_exit_count == 0)
|
|
||||||
atexit(__handle_on_exit_funcs);
|
|
||||||
__on_exit_funcs[__on_exit_count] = function;
|
|
||||||
__on_exit_args[__on_exit_count++] = arg;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void __handle_on_exit_funcs(void)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
for (i = 0; i < __on_exit_count; i++)
|
|
||||||
__on_exit_funcs[i] (__exitcode, __on_exit_args[i]);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
struct record {
|
struct record {
|
||||||
struct perf_tool tool;
|
struct perf_tool tool;
|
||||||
|
|
|
@ -174,7 +174,6 @@ CORE_FEATURE_TESTS = \
|
||||||
libpython-version \
|
libpython-version \
|
||||||
libslang \
|
libslang \
|
||||||
libunwind \
|
libunwind \
|
||||||
on-exit \
|
|
||||||
stackprotector-all \
|
stackprotector-all \
|
||||||
timerfd \
|
timerfd \
|
||||||
libdw-dwarf-unwind
|
libdw-dwarf-unwind
|
||||||
|
@ -200,7 +199,6 @@ VF_FEATURE_TESTS = \
|
||||||
libelf-getphdrnum \
|
libelf-getphdrnum \
|
||||||
libelf-mmap \
|
libelf-mmap \
|
||||||
libpython-version \
|
libpython-version \
|
||||||
on-exit \
|
|
||||||
stackprotector-all \
|
stackprotector-all \
|
||||||
timerfd \
|
timerfd \
|
||||||
libunwind-debug-frame \
|
libunwind-debug-frame \
|
||||||
|
@ -571,12 +569,6 @@ ifneq ($(filter -lbfd,$(EXTLIBS)),)
|
||||||
CFLAGS += -DHAVE_LIBBFD_SUPPORT
|
CFLAGS += -DHAVE_LIBBFD_SUPPORT
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifndef NO_ON_EXIT
|
|
||||||
ifeq ($(feature-on-exit), 1)
|
|
||||||
CFLAGS += -DHAVE_ON_EXIT_SUPPORT
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifndef NO_BACKTRACE
|
ifndef NO_BACKTRACE
|
||||||
ifeq ($(feature-backtrace), 1)
|
ifeq ($(feature-backtrace), 1)
|
||||||
CFLAGS += -DHAVE_BACKTRACE_SUPPORT
|
CFLAGS += -DHAVE_BACKTRACE_SUPPORT
|
||||||
|
|
|
@ -24,7 +24,6 @@ FILES= \
|
||||||
test-libslang.bin \
|
test-libslang.bin \
|
||||||
test-libunwind.bin \
|
test-libunwind.bin \
|
||||||
test-libunwind-debug-frame.bin \
|
test-libunwind-debug-frame.bin \
|
||||||
test-on-exit.bin \
|
|
||||||
test-stackprotector-all.bin \
|
test-stackprotector-all.bin \
|
||||||
test-timerfd.bin \
|
test-timerfd.bin \
|
||||||
test-libdw-dwarf-unwind.bin
|
test-libdw-dwarf-unwind.bin
|
||||||
|
@ -133,9 +132,6 @@ test-liberty-z.bin:
|
||||||
test-cplus-demangle.bin:
|
test-cplus-demangle.bin:
|
||||||
$(BUILD) -liberty
|
$(BUILD) -liberty
|
||||||
|
|
||||||
test-on-exit.bin:
|
|
||||||
$(BUILD)
|
|
||||||
|
|
||||||
test-backtrace.bin:
|
test-backtrace.bin:
|
||||||
$(BUILD)
|
$(BUILD)
|
||||||
|
|
||||||
|
|
|
@ -69,10 +69,6 @@
|
||||||
# include "test-libbfd.c"
|
# include "test-libbfd.c"
|
||||||
#undef main
|
#undef main
|
||||||
|
|
||||||
#define main main_test_on_exit
|
|
||||||
# include "test-on-exit.c"
|
|
||||||
#undef main
|
|
||||||
|
|
||||||
#define main main_test_backtrace
|
#define main main_test_backtrace
|
||||||
# include "test-backtrace.c"
|
# include "test-backtrace.c"
|
||||||
#undef main
|
#undef main
|
||||||
|
@ -110,7 +106,6 @@ int main(int argc, char *argv[])
|
||||||
main_test_gtk2(argc, argv);
|
main_test_gtk2(argc, argv);
|
||||||
main_test_gtk2_infobar(argc, argv);
|
main_test_gtk2_infobar(argc, argv);
|
||||||
main_test_libbfd();
|
main_test_libbfd();
|
||||||
main_test_on_exit();
|
|
||||||
main_test_backtrace();
|
main_test_backtrace();
|
||||||
main_test_libnuma();
|
main_test_libnuma();
|
||||||
main_test_timerfd();
|
main_test_timerfd();
|
||||||
|
|
|
@ -1,16 +0,0 @@
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
|
|
||||||
static void exit_fn(int status, void *__data)
|
|
||||||
{
|
|
||||||
printf("exit status: %d, data: %d\n", status, *(int *)__data);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int data = 123;
|
|
||||||
|
|
||||||
int main(void)
|
|
||||||
{
|
|
||||||
on_exit(exit_fn, &data);
|
|
||||||
|
|
||||||
return 321;
|
|
||||||
}
|
|
Loading…
Reference in New Issue