X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fhashtable%2Futils.c;h=eb51554b2e3d56daa5c2eb872e3069cdcfa8c886;hb=4bd69c5f1161cd065f487da0f4c1aa03a73c47e4;hp=c9d75e289a0cf6f4d39a85b3f98378ff717d6141;hpb=bcd52dd90f07cc4cf4eebf32761568a2c03c540a;p=lttng-tools.git

diff --git a/src/common/hashtable/utils.c b/src/common/hashtable/utils.c
index c9d75e289..eb51554b2 100644
--- a/src/common/hashtable/utils.c
+++ b/src/common/hashtable/utils.c
@@ -1,20 +1,10 @@
 /*
- * Copyright (C) - Bob Jenkins, May 2006
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
- * Copyright (C) 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2006 Bob Jenkins
+ * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /*
@@ -50,7 +40,6 @@
  */
 
 #define _LGPL_SOURCE
-#include <assert.h>
 #include <stdint.h>     /* defines uint32_t etc */
 #include <stdio.h>      /* defines printf for tests */
 #include <string.h>
@@ -274,7 +263,9 @@ static void __attribute__((unused)) hashword2(const uint32_t *k, size_t length,
  * Use for hash table lookup, or anything where one collision in 2^^32 is
  * acceptable.  Do NOT use for cryptographic purposes.
  */
-static uint32_t __attribute__((unused)) hashlittle(const void *key,
+LTTNG_NO_SANITIZE_ADDRESS
+__attribute__((unused))
+static uint32_t hashlittle(const void *key,
 		size_t length, uint32_t initval)
 {
 	uint32_t a,b,c;
@@ -448,7 +439,6 @@ static uint32_t __attribute__((unused)) hashlittle(const void *key,
 	return c;
 }
 
-LTTNG_HIDDEN
 unsigned long hash_key_u64(const void *_key, unsigned long seed)
 {
 	union {
@@ -469,8 +459,8 @@ unsigned long hash_key_u64(const void *_key, unsigned long seed)
 #if (CAA_BITS_PER_LONG == 64)
 /*
  * Hash function for number value.
+ * Pass the value itself as the key, not its address.
  */
-LTTNG_HIDDEN
 unsigned long hash_key_ulong(const void *_key, unsigned long seed)
 {
 	uint64_t __key = (uint64_t) _key;
@@ -479,8 +469,8 @@ unsigned long hash_key_ulong(const void *_key, unsigned long seed)
 #else
 /*
  * Hash function for number value.
+ * Pass the value itself as the key, not its address.
  */
-LTTNG_HIDDEN
 unsigned long hash_key_ulong(const void *_key, unsigned long seed)
 {
 	uint32_t key = (uint32_t) _key;
@@ -492,7 +482,6 @@ unsigned long hash_key_ulong(const void *_key, unsigned long seed)
 /*
  * Hash function for string.
  */
-LTTNG_HIDDEN
 unsigned long hash_key_str(const void *key, unsigned long seed)
 {
 	return hashlittle(key, strlen((const char *) key), seed);
@@ -501,7 +490,6 @@ unsigned long hash_key_str(const void *key, unsigned long seed)
 /*
  * Hash function for two uint64_t.
  */
-LTTNG_HIDDEN
 unsigned long hash_key_two_u64(const void *key, unsigned long seed)
 {
 	const struct lttng_ht_two_u64 *k =
@@ -513,7 +501,6 @@ unsigned long hash_key_two_u64(const void *key, unsigned long seed)
 /*
  * Hash function compare for number value.
  */
-LTTNG_HIDDEN
 int hash_match_key_ulong(const void *key1, const void *key2)
 {
 	if (key1 == key2) {
@@ -526,7 +513,6 @@ int hash_match_key_ulong(const void *key1, const void *key2)
 /*
  * Hash function compare for number value.
  */
-LTTNG_HIDDEN
 int hash_match_key_u64(const void *key1, const void *key2)
 {
 	if (*(const uint64_t *) key1 == *(const uint64_t *) key2) {
@@ -539,7 +525,6 @@ int hash_match_key_u64(const void *key1, const void *key2)
 /*
  * Hash compare function for string.
  */
-LTTNG_HIDDEN
 int hash_match_key_str(const void *key1, const void *key2)
 {
 	if (strcmp(key1, key2) == 0) {
@@ -552,7 +537,6 @@ int hash_match_key_str(const void *key1, const void *key2)
 /*
  * Hash function compare two uint64_t.
  */
-LTTNG_HIDDEN
 int hash_match_key_two_u64(const void *key1, const void *key2)
 {
 	const struct lttng_ht_two_u64 *k1 =