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
...@@ -15,6 +15,9 @@ ...@@ -15,6 +15,9 @@
static inline size_t hash_bits(size_t h, int bits) static inline size_t hash_bits(size_t h, int bits)
{ {
/* shuffle bits and return requested number of upper bits */ /* shuffle bits and return requested number of upper bits */
if (bits == 0)
return 0;
#if (__SIZEOF_SIZE_T__ == __SIZEOF_LONG_LONG__) #if (__SIZEOF_SIZE_T__ == __SIZEOF_LONG_LONG__)
/* LP64 case */ /* LP64 case */
return (h * 11400714819323198485llu) >> (__SIZEOF_LONG_LONG__ * 8 - bits); return (h * 11400714819323198485llu) >> (__SIZEOF_LONG_LONG__ * 8 - bits);
...@@ -174,17 +177,17 @@ bool hashmap__find(const struct hashmap *map, const void *key, void **value); ...@@ -174,17 +177,17 @@ bool hashmap__find(const struct hashmap *map, const void *key, void **value);
* @key: key to iterate entries for * @key: key to iterate entries for
*/ */
#define hashmap__for_each_key_entry(map, cur, _key) \ #define hashmap__for_each_key_entry(map, cur, _key) \
for (cur = ({ size_t bkt = hash_bits(map->hash_fn((_key), map->ctx),\ for (cur = map->buckets \
map->cap_bits); \ ? map->buckets[hash_bits(map->hash_fn((_key), map->ctx), map->cap_bits)] \
map->buckets ? map->buckets[bkt] : NULL; }); \ : NULL; \
cur; \ cur; \
cur = cur->next) \ cur = cur->next) \
if (map->equal_fn(cur->key, (_key), map->ctx)) if (map->equal_fn(cur->key, (_key), map->ctx))
#define hashmap__for_each_key_entry_safe(map, cur, tmp, _key) \ #define hashmap__for_each_key_entry_safe(map, cur, tmp, _key) \
for (cur = ({ size_t bkt = hash_bits(map->hash_fn((_key), map->ctx),\ for (cur = map->buckets \
map->cap_bits); \ ? map->buckets[hash_bits(map->hash_fn((_key), map->ctx), map->cap_bits)] \
cur = map->buckets ? map->buckets[bkt] : NULL; }); \ : NULL; \
cur && ({ tmp = cur->next; true; }); \ cur && ({ tmp = cur->next; true; }); \
cur = tmp) \ cur = tmp) \
if (map->equal_fn(cur->key, (_key), map->ctx)) if (map->equal_fn(cur->key, (_key), map->ctx))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment