Use dynamic type for hash and add subtypes for crc and gfni.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
lib/eal/common/eal_common_log.c | 1 -
lib/eal/include/rte_log.h | 2 +-
lib/hash/rte_cuckoo_hash.c | 5 +++++
lib/hash/rte_fbk_hash.c | 5 +++++
lib/hash/rte_thash.c | 3 +++
lib/hash/rte_thash_gfni.c | 3 +++
6 files changed, 17 insertions(+), 2 deletions(-)
@@ -350,7 +350,6 @@ struct logtype {
static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_EAL, "lib.eal"},
{RTE_LOGTYPE_PMD, "pmd"},
- {RTE_LOGTYPE_HASH, "lib.hash"},
{RTE_LOGTYPE_TABLE, "lib.table"},
{RTE_LOGTYPE_PIPELINE, "lib.pipeline"},
{RTE_LOGTYPE_CRYPTODEV, "lib.cryptodev"},
@@ -32,7 +32,7 @@ extern "C" {
/* was RTE_LOGTYPE_MEMPOOL */
/* was RTE_LOGTYPE_TIMER */
#define RTE_LOGTYPE_PMD 5 /**< Log related to poll mode driver. */
-#define RTE_LOGTYPE_HASH 6 /**< Log related to hash table. */
+ /* was RTE_LOGTYPE_HASH */
/* was RTE_LOGTYPE_LPM */
/* was RTE_LOGTYPE_KNI */
/* was RTE_LOGTYPE_ACL */
@@ -24,6 +24,11 @@
#include <rte_tailq.h>
#include "rte_hash.h"
+
+/* needs to be before rte_cuckoo_hash.h */
+RTE_LOG_REGISTER_DEFAULT(hash_logtype, INFO);
+#define RTE_LOGTYPE_HASH hash_logtype
+
#include "rte_cuckoo_hash.h"
/* Mask of all flags supported by this version */
@@ -8,6 +8,8 @@
#include <errno.h>
#include <sys/queue.h>
+
+#include <rte_cpuflags.h>
#include <rte_eal_memconfig.h>
#include <rte_malloc.h>
#include <rte_common.h>
@@ -18,6 +20,9 @@
#include "rte_fbk_hash.h"
+RTE_LOG_REGISTER_SUFFIX(fbk_hash_logtype, fbk, INFO);
+#define RTE_LOGTYPE_HASH fbk_hash_logtype
+
TAILQ_HEAD(rte_fbk_hash_list, rte_tailq_entry);
static struct rte_tailq_elem rte_fbk_hash_tailq = {
@@ -13,6 +13,9 @@
#include <rte_log.h>
#include <rte_malloc.h>
+RTE_LOG_REGISTER_SUFFIX(thash_logtype, thash, INFO);
+#define RTE_LOGTYPE_HASH thash_logtype
+
#define THASH_NAME_LEN 64
#define TOEPLITZ_HASH_LEN 32
@@ -10,6 +10,9 @@
#ifndef RTE_THASH_GFNI_DEFINED
+RTE_LOG_REGISTER_SUFFIX(hash_gfni_logtype, gfni, INFO);
+#define RTE_LOGTYPE_HASH hash_gfni_logtype
+
uint32_t
rte_thash_gfni(const uint64_t *mtrx __rte_unused,
const uint8_t *key __rte_unused, int len __rte_unused)