From cecabda899366e6d1e4add32316f8630ff583389 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 6 Apr 2021 19:53:59 -0400 Subject: [PATCH] Move lttng-hash-helper.h to 'src/common/' Change-Id: I35cbbba23d610c28087e43d27b04aa3d0755dbaa Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- src/common/Makefile.am | 1 + src/{lib/lttng-ust/lttng-hash-helper.h => common/hash.h} | 6 +++--- src/lib/lttng-ust/Makefile.am | 1 - src/lib/lttng-ust/lttng-bytecode-validator.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename src/{lib/lttng-ust/lttng-hash-helper.h => common/hash.h} (97%) diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 209364d0..15aba9b5 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -16,6 +16,7 @@ noinst_HEADERS = \ elf.h \ err-ptr.h \ events.h \ + hash.h \ jhash.h \ logging.h \ macros.h \ diff --git a/src/lib/lttng-ust/lttng-hash-helper.h b/src/common/hash.h similarity index 97% rename from src/lib/lttng-ust/lttng-hash-helper.h rename to src/common/hash.h index 36c3ae42..c3ffc18d 100644 --- a/src/lib/lttng-ust/lttng-hash-helper.h +++ b/src/common/hash.h @@ -6,8 +6,8 @@ * LTTng hash table helpers. */ -#ifndef _LTTNG_HASH_HELPER_H -#define _LTTNG_HASH_HELPER_H +#ifndef _UST_COMMON_HASH_H +#define _UST_COMMON_HASH_H #include #include @@ -147,4 +147,4 @@ unsigned long lttng_hash_mix(const void *_key, size_t length, unsigned long seed } #endif -#endif /* _LTTNG_HASH_HELPER_H */ +#endif /* _UST_COMMON_HASH_H */ diff --git a/src/lib/lttng-ust/Makefile.am b/src/lib/lttng-ust/Makefile.am index aafcbd5f..7537bb7d 100644 --- a/src/lib/lttng-ust/Makefile.am +++ b/src/lib/lttng-ust/Makefile.am @@ -65,7 +65,6 @@ liblttng_ust_runtime_la_SOURCES = \ lttng-context-vsgid.c \ lttng-context.c \ lttng-events.c \ - lttng-hash-helper.h \ lttng-ust-elf.c \ lttng-ust-elf.h \ lttng-ust-statedump.c \ diff --git a/src/lib/lttng-ust/lttng-bytecode-validator.c b/src/lib/lttng-ust/lttng-bytecode-validator.c index 34657d00..9f127f78 100644 --- a/src/lib/lttng-ust/lttng-bytecode-validator.c +++ b/src/lib/lttng-ust/lttng-bytecode-validator.c @@ -14,7 +14,7 @@ #include "rculfhash.h" #include "lttng-bytecode.h" -#include "lttng-hash-helper.h" +#include "common/hash.h" #include "string-utils.h" #include "lib/lttng-ust/events.h" #include "common/macros.h" -- 2.34.1