Commit f282f7a0 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo-20160803' of... 

Merge tag 'perf-core-for-mingo-20160803' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

New features:

- Add --sample-cpu to 'perf record', to explicitely ask for sampling
  the CPU (Jiri Olsa)

Fixes:

- Fix processing of multi byte chunks in objdump output, fixing
  disassemble processing for annotation on at least ARM64 (Jan Stancek)

- Use SyS_epoll_wait in a BPF 'perf test' entry instead of sys_epoll_wait, that
  is not present in the DWARF info in vmlinux files (Arnaldo Carvalho de Melo)

- Add -wno-shadow when processing files using perl headers, fixing
  the build on Fedora Rawhide and Arch Linux (Namhyung Kim)

Infrastructure changes:

- Annotate prep work to better catch and report errors related to
  using objdump to disassemble DSOs (Arnaldo Carvalho de Melo)

- Add 'alloc', 'scnprintf' and 'and' methods for bitmap processing (Jiri Olsa)

- Add nested output resorting callback in hists processing (Jiri Olsa)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 0d87d7ec c369e0a1

tools/include/linux/bitmap.h

+37 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#include <string.h>

#include <linux/bitops.h>

#include <stdlib.h>



#define DECLARE_BITMAP(name,bits) \

	unsigned long name[BITS_TO_LONGS(bits)]
@@ -10,6 +11,8 @@ 
int __bitmap_weight(const unsigned long *bitmap, int bits);

void __bitmap_or(unsigned long *dst, const unsigned long *bitmap1,

		 const unsigned long *bitmap2, int bits);

int __bitmap_and(unsigned long *dst, const unsigned long *bitmap1,

		 const unsigned long *bitmap2, unsigned int bits);



#define BITMAP_FIRST_WORD_MASK(start) (~0UL << ((start) & (BITS_PER_LONG - 1)))
@@ -65,4 +68,38 @@ static inline int test_and_set_bit(int nr, unsigned long *addr) 
	return (old & mask) != 0;

}



/**

 * bitmap_alloc - Allocate bitmap

 * @nr: Bit to set

 */

static inline unsigned long *bitmap_alloc(int nbits)

{

	return calloc(1, BITS_TO_LONGS(nbits) * sizeof(unsigned long));

}



/*

 * bitmap_scnprintf - print bitmap list into buffer

 * @bitmap: bitmap

 * @nbits: size of bitmap

 * @buf: buffer to store output

 * @size: size of @buf

 */

size_t bitmap_scnprintf(unsigned long *bitmap, int nbits,

			char *buf, size_t size);



/**

 * bitmap_and - Do logical and on bitmaps

 * @dst: resulting bitmap

 * @src1: operand 1

 * @src2: operand 2

 * @nbits: size of bitmap

 */

static inline int bitmap_and(unsigned long *dst, const unsigned long *src1,

			     const unsigned long *src2, unsigned int nbits)

{

	if (small_const_nbits(nbits))

		return (*dst = *src1 & *src2 & BITMAP_LAST_WORD_MASK(nbits)) != 0;

	return __bitmap_and(dst, src1, src2, nbits);

}



#endif /* _PERF_BITOPS_H */

tools/lib/bitmap.c

+44 −0
Original line number Diff line number Diff line
@@ -29,3 +29,47 @@ void __bitmap_or(unsigned long *dst, const unsigned long *bitmap1, 
	for (k = 0; k < nr; k++)

		dst[k] = bitmap1[k] | bitmap2[k];

}



size_t bitmap_scnprintf(unsigned long *bitmap, int nbits,

			char *buf, size_t size)

{

	/* current bit is 'cur', most recently seen range is [rbot, rtop] */

	int cur, rbot, rtop;

	bool first = true;

	size_t ret = 0;



	rbot = cur = find_first_bit(bitmap, nbits);

	while (cur < nbits) {

		rtop = cur;

		cur = find_next_bit(bitmap, nbits, cur + 1);

		if (cur < nbits && cur <= rtop + 1)

			continue;



		if (!first)

			ret += scnprintf(buf + ret, size - ret, ",");



		first = false;



		ret += scnprintf(buf + ret, size - ret, "%d", rbot);

		if (rbot < rtop)

			ret += scnprintf(buf + ret, size - ret, "-%d", rtop);



		rbot = cur;

	}

	return ret;

}



int __bitmap_and(unsigned long *dst, const unsigned long *bitmap1,

		 const unsigned long *bitmap2, unsigned int bits)

{

	unsigned int k;

	unsigned int lim = bits/BITS_PER_LONG;

	unsigned long result = 0;



	for (k = 0; k < lim; k++)

		result |= (dst[k] = bitmap1[k] & bitmap2[k]);

	if (bits % BITS_PER_LONG)

		result |= (dst[k] = bitmap1[k] & bitmap2[k] &

			   BITMAP_LAST_WORD_MASK(bits));

	return result != 0;

}

tools/lib/traceevent/.gitignore

+1 −0
Original line number Diff line number Diff line 
TRACEEVENT-CFLAGS

libtraceevent-dynamic-list

libtraceevent.so.*

tools/perf/Documentation/perf-record.txt

+3 −0
Original line number Diff line number Diff line
@@ -192,6 +192,9 @@ OPTIONS 
--period::

	Record the sample period.



--sample-cpu::

	Record the sample cpu.



-n::

--no-samples::

	Don't sample.

CRA Git | Maintained and supported by SUSTech CRA and CCSE