Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a116dd2 authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Ingo Molnar
Browse files

perf tools: Use kernel bitmap library 



Use the kernel bitmap library for internal perf tools uses.

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
LKML-Reference: <1255792354-11304-1-git-send-email-fweisbec@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 11018201

tools/perf/Makefile

+16 −0
Original line number Diff line number Diff line
@@ -363,6 +363,9 @@ LIB_OBJS += util/parse-options.o 
LIB_OBJS += util/parse-events.o

LIB_OBJS += util/path.o

LIB_OBJS += util/rbtree.o

LIB_OBJS += util/bitmap.o

LIB_OBJS += util/hweight.o

LIB_OBJS += util/find_next_bit.o

LIB_OBJS += util/run-command.o

LIB_OBJS += util/quote.o

LIB_OBJS += util/strbuf.o
@@ -790,6 +793,19 @@ util/config.o: util/config.c PERF-CFLAGS 
util/rbtree.o: ../../lib/rbtree.c PERF-CFLAGS

	$(QUIET_CC)$(CC) -o util/rbtree.o -c $(ALL_CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $<



# some perf warning policies can't fit to lib/bitmap.c, eg: it warns about variable shadowing

# from <string.h> that comes from kernel headers wrapping.

KBITMAP_FLAGS=`echo $(ALL_CFLAGS) | sed s/-Wshadow// | sed s/-Wswitch-default// | sed s/-Wextra//`



util/bitmap.o: ../../lib/bitmap.c PERF-CFLAGS

	$(QUIET_CC)$(CC) -o util/bitmap.o -c $(KBITMAP_FLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $<



util/hweight.o: ../../lib/hweight.c PERF-CFLAGS

	$(QUIET_CC)$(CC) -o util/hweight.o -c $(ALL_CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $<



util/find_next_bit.o: ../../lib/find_next_bit.c PERF-CFLAGS

	$(QUIET_CC)$(CC) -o util/find_next_bit.o -c $(ALL_CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $<



perf-%$X: %.o $(PERFLIBS)

	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)

tools/perf/builtin-record.c

+0 −3
Original line number Diff line number Diff line
@@ -21,9 +21,6 @@ 
#include <unistd.h>

#include <sched.h>



#define ALIGN(x, a)		__ALIGN_MASK(x, (typeof(x))(a)-1)

#define __ALIGN_MASK(x, mask)	(((x)+(mask))&~(mask))



static int			fd[MAX_NR_CPUS][MAX_COUNTERS];



static long			default_interval		=      0;

tools/perf/builtin-sched.c

+0 −2
Original line number Diff line number Diff line
@@ -38,8 +38,6 @@ static int cwdlen; 
#define PR_SET_NAME		15               /* Set process name */

#define MAX_CPUS		4096



#define BUG_ON(x)		assert(!(x))



static u64			run_measurement_overhead;

static u64			sleep_measurement_overhead;

tools/perf/util/include/asm/bitops.h

0 → 100644
+6 −0
Original line number Diff line number Diff line 
#include "../../../../include/asm-generic/bitops/__fls.h"

#include "../../../../include/asm-generic/bitops/fls.h"

#include "../../../../include/asm-generic/bitops/fls64.h"

#include "../../../../include/asm-generic/bitops/__ffs.h"

#include "../../../../include/asm-generic/bitops/ffz.h"

#include "../../../../include/asm-generic/bitops/hweight.h"

tools/perf/util/include/asm/byteorder.h

0 → 100644
+2 −0
Original line number Diff line number Diff line 
#include "../asm/types.h"

#include "../../../../include/linux/swab.h"