Merge remote-tracking branch 'cbab-github/tests-cleanup' into cbab

[lttng-tools.git] / src / common / hashtable / utils.c

diff --git a/src/common/hashtable/utils.c b/src/common/hashtable/utils.c
index 0b3d53160e384fa94c43a33a86a9b457b92a66f8..8d0e515aecafbb94a347c418f23bf341f719f71c 100644 (file)
--- a/src/common/hashtable/utils.c
+++ b/src/common/hashtable/utils.c
@@ -1,8 +1,23 @@
 /*
- * Copyright (C) - Bob Jenkins, May 2006, Public Domain.
+ * Copyright (C) - Bob Jenkins, May 2006
  * 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.
+ *
+ * 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.
+ */
+
+/*
  * These are functions for producing 32-bit hashes for hash table lookup.
  * hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final() are
  * externally useful functions.  Routines to test the hash are included if
@@ -33,9 +48,8 @@
  * with 12*3 instructions on 3 integers than you can with 3 instructions on 1
  * byte), but shoehorning those bytes into integers efficiently is messy.
  */
-
+#define _GNU_SOURCE
 #include <assert.h>
-#include <endian.h>    /* attempt to define endianness */
 #include <stdint.h>     /* defines uint32_t etc */
 #include <stdio.h>      /* defines printf for tests */
 #include <string.h>
@@ -44,6 +58,8 @@
 #include <urcu/compiler.h>
 
 #include "utils.h"
+#include <common/compat/endian.h>    /* attempt to define endianness */
+#include <common/common.h>
 
 /*
  * My best guess at if you are big-endian or little-endian.  This may
@@ -430,11 +446,8 @@ static uint32_t __attribute__((unused)) hashlittle(const void *key,
        return c;
 }
 
-#if (CAA_BITS_PER_LONG == 64)
-/*
- * Hash function for number value.
- */
-unsigned long hash_key_ulong(void *_key, unsigned long seed)
+LTTNG_HIDDEN
+unsigned long hash_key_u64(void *_key, unsigned long seed)
 {
        union {
                uint64_t v64;
@@ -446,14 +459,26 @@ unsigned long hash_key_ulong(void *_key, unsigned long seed)
        } key;
 
        v.v64 = (uint64_t) seed;
-       key.v64 = (uint64_t) _key;
+       key.v64 = *(uint64_t *) _key;
        hashword2(key.v32, 2, &v.v32[0], &v.v32[1]);
        return v.v64;
 }
+
+#if (CAA_BITS_PER_LONG == 64)
+/*
+ * Hash function for number value.
+ */
+LTTNG_HIDDEN
+unsigned long hash_key_ulong(void *_key, unsigned long seed)
+{
+       uint64_t __key = (uint64_t) _key;
+       return (unsigned long) hash_key_u64(&__key, seed);
+}
 #else
 /*
  * Hash function for number value.
  */
+LTTNG_HIDDEN
 unsigned long hash_key_ulong(void *_key, unsigned long seed)
 {
        uint32_t key = (uint32_t) _key;
@@ -465,6 +490,7 @@ unsigned long hash_key_ulong(void *_key, unsigned long seed)
 /*
  * Hash function for string.
  */
+LTTNG_HIDDEN
 unsigned long hash_key_str(void *key, unsigned long seed)
 {
        return hashlittle(key, strlen((char *) key), seed);
@@ -473,6 +499,7 @@ unsigned long hash_key_str(void *key, unsigned long seed)
 /*
  * Hash function compare for number value.
  */
+LTTNG_HIDDEN
 int hash_match_key_ulong(void *key1, void *key2)
 {
        if (key1 == key2) {
@@ -482,9 +509,23 @@ int hash_match_key_ulong(void *key1, void *key2)
        return 0;
 }
 
+/*
+ * Hash function compare for number value.
+ */
+LTTNG_HIDDEN
+int hash_match_key_u64(void *key1, void *key2)
+{
+       if (*(uint64_t *) key1 == *(uint64_t *) key2) {
+               return 1;
+       }
+
+       return 0;
+}
+
 /*
  * Hash compare function for string.
  */
+LTTNG_HIDDEN
 int hash_match_key_str(void *key1, void *key2)
 {
        if (strcmp(key1, key2) == 0) {