Commit 94fddb7a authored Jul 17, 2020 by Arnaldo Carvalho de Melo

perf tools: Sync hashmap.h with libbpf's



To pick up the changes in:

  b2f9f153 ("libbpf: Fix libbpf hashmap on (I)LP32 architectures")

Silencing this warning:

  Warning: Kernel ABI header at 'tools/perf/util/hashmap.h' differs from latest version at 'tools/lib/bpf/hashmap.h'
  diff -u tools/perf/util/hashmap.h tools/lib/bpf/hashmap.h

I'll eventually update the warning to remove the "Kernel ABI" part
and instead state libbpf when noticing that the original is at
"tools/lib/something".

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Andrii Nakryiko <andriin@fb.com>
Cc: Jakub Bogusz <qboosh@pld-linux.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Ian Rogers <irogers@google.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent a2db71b9

tools/perf/util/hashmap.h

+8 −4

Original line number	Diff line number	Diff line
		@@ -11,14 +11,18 @@
		#include <stdbool.h>
		#include <stddef.h>
		#include <limits.h>
		#ifndef __WORDSIZE
		#define __WORDSIZE (__SIZEOF_LONG__ * 8)
		#endif

		static inline size_t hash_bits(size_t h, int bits)
		{
		/* shuffle bits and return requested number of upper bits */
		return (h * 11400714819323198485llu) >> (__WORDSIZE - bits);
		#if (__SIZEOF_SIZE_T__ == __SIZEOF_LONG_LONG__)
		/* LP64 case */
		return (h * 11400714819323198485llu) >> (__SIZEOF_LONG_LONG__ * 8 - bits);
		#elif (__SIZEOF_SIZE_T__ <= __SIZEOF_LONG__)
		return (h * 2654435769lu) >> (__SIZEOF_LONG__ * 8 - bits);
		#else
		# error "Unsupported size_t size"
		#endif
		}

		typedef size_t (hashmap_hash_fn)(const void key, void *ctx);

Admin message