doc: add Meson coding style to contributors guide

[dpdk.git] / lib / librte_table / rte_table_array.c

diff --git a/lib/librte_table/rte_table_array.c b/lib/librte_table/rte_table_array.c
index 4d3c05e..8264c50 100644 (file)
--- a/lib/librte_table/rte_table_array.c
+++ b/lib/librte_table/rte_table_array.c
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   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
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * 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
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
  */
 
 #include <string.h>
@@ -36,12 +7,29 @@
 
 #include <rte_common.h>
 #include <rte_mbuf.h>
+#include <rte_memory.h>
 #include <rte_malloc.h>
 #include <rte_log.h>
 
 #include "rte_table_array.h"
 
+#ifdef RTE_TABLE_STATS_COLLECT
+
+#define RTE_TABLE_ARRAY_STATS_PKTS_IN_ADD(table, val) \
+       table->stats.n_pkts_in += val
+#define RTE_TABLE_ARRAY_STATS_PKTS_LOOKUP_MISS(table, val) \
+       table->stats.n_pkts_lookup_miss += val
+
+#else
+
+#define RTE_TABLE_ARRAY_STATS_PKTS_IN_ADD(table, val)
+#define RTE_TABLE_ARRAY_STATS_PKTS_LOOKUP_MISS(table, val)
+
+#endif
+
 struct rte_table_array {
+       struct rte_table_stats stats;
+
        /* Input parameters */
        uint32_t entry_size;
        uint32_t n_entries;
@@ -57,18 +45,15 @@ struct rte_table_array {
 static void *
 rte_table_array_create(void *params, int socket_id, uint32_t entry_size)
 {
-       struct rte_table_array_params *p =
-               (struct rte_table_array_params *) params;
+       struct rte_table_array_params *p = params;
        struct rte_table_array *t;
        uint32_t total_cl_size, total_size;
 
        /* Check input parameters */
        if ((p == NULL) ||
            (p->n_entries == 0) ||
-               (!rte_is_power_of_2(p->n_entries)) ||
-               ((p->offset & 0x3) != 0)) {
+               (!rte_is_power_of_2(p->n_entries)))
                return NULL;
-       }
 
        /* Memory allocation */
        total_cl_size = (sizeof(struct rte_table_array) +
@@ -96,7 +81,7 @@ rte_table_array_create(void *params, int socket_id, uint32_t entry_size)
 static int
 rte_table_array_free(void *table)
 {
-       struct rte_table_array *t = (struct rte_table_array *) table;
+       struct rte_table_array *t = table;
 
        /* Check input parameters */
        if (t == NULL) {
@@ -118,8 +103,8 @@ rte_table_array_entry_add(
        int *key_found,
        void **entry_ptr)
 {
-       struct rte_table_array *t = (struct rte_table_array *) table;
-       struct rte_table_array_key *k = (struct rte_table_array_key *) key;
+       struct rte_table_array *t = table;
+       struct rte_table_array_key *k = key;
        uint8_t *table_entry;
 
        /* Check input parameters */
@@ -163,7 +148,8 @@ rte_table_array_lookup(
        void **entries)
 {
        struct rte_table_array *t = (struct rte_table_array *) table;
-
+       __rte_unused uint32_t n_pkts_in = __builtin_popcountll(pkts_mask);
+       RTE_TABLE_ARRAY_STATS_PKTS_IN_ADD(t, n_pkts_in);
        *lookup_hit_mask = pkts_mask;
 
        if ((pkts_mask & (pkts_mask + 1)) == 0) {
@@ -195,10 +181,27 @@ rte_table_array_lookup(
        return 0;
 }
 
+static int
+rte_table_array_stats_read(void *table, struct rte_table_stats *stats, int clear)
+{
+       struct rte_table_array *array = table;
+
+       if (stats != NULL)
+               memcpy(stats, &array->stats, sizeof(array->stats));
+
+       if (clear)
+               memset(&array->stats, 0, sizeof(array->stats));
+
+       return 0;
+}
+
 struct rte_table_ops rte_table_array_ops = {
        .f_create = rte_table_array_create,
        .f_free = rte_table_array_free,
        .f_add = rte_table_array_entry_add,
        .f_delete = NULL,
+       .f_add_bulk = NULL,
+       .f_delete_bulk = NULL,
        .f_lookup = rte_table_array_lookup,
+       .f_stats = rte_table_array_stats_read,
 };