/*-
* BSD LICENSE
- *
- * Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
+ *
+ * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* * Neither the name of Intel Corporation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
#include <string.h>
#ifndef RTE_FBK_HASH_FUNC_DEFAULT
-#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
+#if defined(RTE_ARCH_X86) || defined(RTE_MACHINE_CPUFLAG_CRC32)
#include <rte_hash_crc.h>
/** Default four-byte key hash function if none is specified. */
#define RTE_FBK_HASH_FUNC_DEFAULT rte_hash_crc_4byte
};
-
/** The four-byte key hash table structure. */
struct rte_fbk_hash_table {
- TAILQ_ENTRY(rte_fbk_hash_table) next; /**< Linked list. */
-
char name[RTE_FBK_HASH_NAMESIZE]; /**< Name of the hash. */
uint32_t entries; /**< Total number of entries. */
uint32_t entries_per_bucket; /**< Number of entries in a bucket. */
uint32_t init_val; /**< For initialising hash function. */
/** A flat table of all buckets. */
- union rte_fbk_hash_entry t[0];
+ union rte_fbk_hash_entry t[];
};
/**
}
/**
- * Add a key to an existing hash table with bucket id.
+ * Add a key to an existing hash table with bucket id.
* This operation is not multi-thread safe
* and should only be called from one thread.
*
}
}
- return -ENOSPC; /* No space in bucket. */
+ return -ENOSPC; /* No space in bucket. */
}
/**
rte_fbk_hash_add_key(struct rte_fbk_hash_table *ht,
uint32_t key, uint16_t value)
{
- return rte_fbk_hash_add_key_with_bucket(ht,
+ return rte_fbk_hash_add_key_with_bucket(ht,
key, value, rte_fbk_hash_get_bucket(ht, key));
}
/**
- * Remove a key with a given bucket id from an existing hash table.
+ * Remove a key with a given bucket id from an existing hash table.
* This operation is not multi-thread
* safe and should only be called from one thread.
*
* 0 if ok, or negative value on error.
*/
static inline int
-rte_fbk_hash_delete_key_with_bucket(struct rte_fbk_hash_table *ht,
+rte_fbk_hash_delete_key_with_bucket(struct rte_fbk_hash_table *ht,
uint32_t key, uint32_t bucket)
{
uint32_t last_entry = ht->entries_per_bucket - 1;
static inline int
rte_fbk_hash_delete_key(struct rte_fbk_hash_table *ht, uint32_t key)
{
- return rte_fbk_hash_delete_key_with_bucket(ht,
+ return rte_fbk_hash_delete_key_with_bucket(ht,
key, rte_fbk_hash_get_bucket(ht, key));
}
/**
- * Find a key in the hash table with a given bucketid.
+ * Find a key in the hash table with a given bucketid.
* This operation is multi-thread safe.
*
* @param ht
* The value that was associated with the key, or negative value on error.
*/
static inline int
-rte_fbk_hash_lookup_with_bucket(const struct rte_fbk_hash_table *ht,
+rte_fbk_hash_lookup_with_bucket(const struct rte_fbk_hash_table *ht,
uint32_t key, uint32_t bucket)
{
union rte_fbk_hash_entry current_entry;
* Possible rte_errno error values include:
* - E_RTE_NO_CONFIG - function could not get pointer to rte_config structure
* - E_RTE_SECONDARY - function was called from a secondary process instance
- * - E_RTE_NO_TAILQ - no tailq list could be got for the fbk hash table list
* - EINVAL - invalid parameter value passed to function
* - ENOSPC - the maximum number of memzones has already been allocated
* - EEXIST - a memzone with the same name already exists