Skip to content

Commit

Permalink
perf tools: Get rid of on_exit() feature test
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Namhyung Kim authored and Jiri Olsa committed May 12, 2014
1 parent 4560471 commit bac1e4d
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 64 deletions.
31 changes: 0 additions & 31 deletions tools/perf/builtin-record.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,37 +30,6 @@
#include <sched.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 perf_tool tool;
Expand Down
8 changes: 0 additions & 8 deletions tools/perf/config/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,6 @@ CORE_FEATURE_TESTS = \
libpython-version \
libslang \
libunwind \
on-exit \
stackprotector-all \
timerfd \
libdw-dwarf-unwind
Expand All @@ -200,7 +199,6 @@ VF_FEATURE_TESTS = \
libelf-getphdrnum \
libelf-mmap \
libpython-version \
on-exit \
stackprotector-all \
timerfd \
libunwind-debug-frame \
Expand Down Expand Up @@ -571,12 +569,6 @@ ifneq ($(filter -lbfd,$(EXTLIBS)),)
CFLAGS += -DHAVE_LIBBFD_SUPPORT
endif

ifndef NO_ON_EXIT
ifeq ($(feature-on-exit), 1)
CFLAGS += -DHAVE_ON_EXIT_SUPPORT
endif
endif

ifndef NO_BACKTRACE
ifeq ($(feature-backtrace), 1)
CFLAGS += -DHAVE_BACKTRACE_SUPPORT
Expand Down
4 changes: 0 additions & 4 deletions tools/perf/config/feature-checks/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ FILES= \
test-libslang.bin \
test-libunwind.bin \
test-libunwind-debug-frame.bin \
test-on-exit.bin \
test-stackprotector-all.bin \
test-timerfd.bin \
test-libdw-dwarf-unwind.bin
Expand Down Expand Up @@ -133,9 +132,6 @@ test-liberty-z.bin:
test-cplus-demangle.bin:
$(BUILD) -liberty

test-on-exit.bin:
$(BUILD)

test-backtrace.bin:
$(BUILD)

Expand Down
5 changes: 0 additions & 5 deletions tools/perf/config/feature-checks/test-all.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,6 @@
# include "test-libbfd.c"
#undef main

#define main main_test_on_exit
# include "test-on-exit.c"
#undef main

#define main main_test_backtrace
# include "test-backtrace.c"
#undef main
Expand Down Expand Up @@ -110,7 +106,6 @@ int main(int argc, char *argv[])
main_test_gtk2(argc, argv);
main_test_gtk2_infobar(argc, argv);
main_test_libbfd();
main_test_on_exit();
main_test_backtrace();
main_test_libnuma();
main_test_timerfd();
Expand Down
16 changes: 0 additions & 16 deletions tools/perf/config/feature-checks/test-on-exit.c

This file was deleted.

0 comments on commit bac1e4d

Please sign in to comment.