Commit 3b13eaf0 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf tools: Update copy of libbpf's hashmap.c 



To pick the changes in:

  7a078d2d ("libbpf, hashmap: Fix undefined behavior in hash_bits")

That don't entail any changes in tools/perf.

This addresses this perf build 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

Not a kernel ABI, its just that this uses the mechanism in place for
checking kernel ABI files drift.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 85a2c56c

tools/perf/util/hashmap.h

+9 −6
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ 
static inline size_t hash_bits(size_t h, int bits)

{

	/* shuffle bits and return requested number of upper bits */

	if (bits == 0)

		return 0;



#if (__SIZEOF_SIZE_T__ == __SIZEOF_LONG_LONG__)

	/* LP64 case */

	return (h * 11400714819323198485llu) >> (__SIZEOF_LONG_LONG__ * 8 - bits);
@@ -174,17 +177,17 @@ bool hashmap__find(const struct hashmap *map, const void *key, void **value); 
 * @key: key to iterate entries for

 */

#define hashmap__for_each_key_entry(map, cur, _key)			    \

	for (cur = ({ size_t bkt = hash_bits(map->hash_fn((_key), map->ctx),\

					     map->cap_bits);		    \

		     map->buckets ? map->buckets[bkt] : NULL; });	    \

	for (cur = map->buckets						    \

		     ? map->buckets[hash_bits(map->hash_fn((_key), map->ctx), map->cap_bits)] \

		     : NULL;						    \

	     cur;							    \

	     cur = cur->next)						    \

		if (map->equal_fn(cur->key, (_key), map->ctx))



#define hashmap__for_each_key_entry_safe(map, cur, tmp, _key)		    \

	for (cur = ({ size_t bkt = hash_bits(map->hash_fn((_key), map->ctx),\

					     map->cap_bits);		    \

		     cur = map->buckets ? map->buckets[bkt] : NULL; });	    \

	for (cur = map->buckets						    \

		     ? map->buckets[hash_bits(map->hash_fn((_key), map->ctx), map->cap_bits)] \

		     : NULL;						    \

	     cur && ({ tmp = cur->next; true; });			    \

	     cur = tmp)							    \

		if (map->equal_fn(cur->key, (_key), map->ctx))

CRA Git | Maintained and supported by SUSTech CRA and CCSE