Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/99907/?format=api
{ "id": 99907, "url": "http://patches.dpdk.org/api/patches/99907/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210928112912.785412-4-andrew.rybchenko@oktetlabs.ru/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20210928112912.785412-4-andrew.rybchenko@oktetlabs.ru>", "list_archive_url": "https://inbox.dpdk.org/dev/20210928112912.785412-4-andrew.rybchenko@oktetlabs.ru", "date": "2021-09-28T11:29:04", "name": "[03/11] net/sfc: rename SW stats structures", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "bda76f4b14678096ba3ed1696b7aad3a83c3110c", "submitter": { "id": 2013, "url": "http://patches.dpdk.org/api/people/2013/?format=api", "name": "Andrew Rybchenko", "email": "Andrew.Rybchenko@oktetlabs.ru" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20210928112912.785412-4-andrew.rybchenko@oktetlabs.ru/mbox/", "series": [ { "id": 19227, "url": "http://patches.dpdk.org/api/series/19227/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=19227", "date": "2021-09-28T11:29:01", "name": "net/sfc: support per-queue stats on EF100", "version": 1, "mbox": "http://patches.dpdk.org/series/19227/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/99907/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/99907/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 7853BA0032;\n\tTue, 28 Sep 2021 13:29:54 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 84E30410F6;\n\tTue, 28 Sep 2021 13:29:41 +0200 (CEST)", "from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113])\n by mails.dpdk.org (Postfix) with ESMTP id 3F875410EE\n for <dev@dpdk.org>; Tue, 28 Sep 2021 13:29:39 +0200 (CEST)", "by shelob.oktetlabs.ru (Postfix, from userid 122)\n id 1473C7F6D2; Tue, 28 Sep 2021 14:29:39 +0300 (MSK)", "from aros.oktetlabs.ru (aros.oktetlabs.ru [192.168.38.17])\n by shelob.oktetlabs.ru (Postfix) with ESMTP id 597FC7F6D5;\n Tue, 28 Sep 2021 14:29:31 +0300 (MSK)" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.2 (2018-09-13) on shelob.oktetlabs.ru", "X-Spam-Level": "", "X-Spam-Status": "No, score=0.8 required=5.0 tests=ALL_TRUSTED,\n DKIM_ADSP_DISCARD,\n URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2", "DKIM-Filter": "OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru 597FC7F6D5", "Authentication-Results": "shelob.oktetlabs.ru/597FC7F6D5; dkim=none;\n dkim-atps=neutral", "From": "Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>", "To": "dev@dpdk.org", "Cc": "Ivan Ilchenko <ivan.ilchenko@oktetlabs.ru>", "Date": "Tue, 28 Sep 2021 14:29:04 +0300", "Message-Id": "<20210928112912.785412-4-andrew.rybchenko@oktetlabs.ru>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20210928112912.785412-1-andrew.rybchenko@oktetlabs.ru>", "References": "<20210928112912.785412-1-andrew.rybchenko@oktetlabs.ru>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH 03/11] net/sfc: rename SW stats structures", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Ivan Ilchenko <ivan.ilchenko@oktetlabs.ru>\n\nDelete 'x' in:\n 1. per-adapter 'struct sfc_sw_xstats' with corresponding\n field 'sw_xstats'.\n 2. 'struct sfc_sw_xstat_descr' and callback prototype\n 'sfc_get_sw_xstat_val_t' with its implementations.\n\nThe 'x' stands for 'extended' in RTE but from sfc point of\nview these are just SW stats.\n\nSigned-off-by: Ivan Ilchenko <ivan.ilchenko@oktetlabs.ru>\nSigned-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>\n---\n drivers/net/sfc/sfc.h | 4 +-\n drivers/net/sfc/sfc_sw_stats.c | 114 ++++++++++++++++-----------------\n 2 files changed, 59 insertions(+), 59 deletions(-)", "diff": "diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h\nindex 331e06bac6..93d5202a24 100644\n--- a/drivers/net/sfc/sfc.h\n+++ b/drivers/net/sfc/sfc.h\n@@ -217,7 +217,7 @@ struct sfc_counter_rxq {\n \tstruct rte_mempool\t\t*mp;\n };\n \n-struct sfc_sw_xstats {\n+struct sfc_sw_stats {\n \tuint64_t\t\t\t*reset_vals;\n \n \trte_spinlock_t\t\t\tqueues_bitmap_lock;\n@@ -257,7 +257,7 @@ struct sfc_adapter {\n \tstruct sfc_sriov\t\tsriov;\n \tstruct sfc_intr\t\t\tintr;\n \tstruct sfc_port\t\t\tport;\n-\tstruct sfc_sw_xstats\t\tsw_xstats;\n+\tstruct sfc_sw_stats\t\tsw_stats;\n \tstruct sfc_filter\t\tfilter;\n \tstruct sfc_mae\t\t\tmae;\n \ndiff --git a/drivers/net/sfc/sfc_sw_stats.c b/drivers/net/sfc/sfc_sw_stats.c\nindex a9f1790d38..108f301822 100644\n--- a/drivers/net/sfc/sfc_sw_stats.c\n+++ b/drivers/net/sfc/sfc_sw_stats.c\n@@ -15,17 +15,17 @@ enum sfc_sw_stats_type {\n \tSFC_SW_STATS_TX,\n };\n \n-typedef uint64_t sfc_get_sw_xstat_val_t(struct sfc_adapter *sa, uint16_t qid);\n+typedef uint64_t sfc_get_sw_stat_val_t(struct sfc_adapter *sa, uint16_t qid);\n \n-struct sfc_sw_xstat_descr {\n+struct sfc_sw_stat_descr {\n \tconst char *name;\n \tenum sfc_sw_stats_type type;\n-\tsfc_get_sw_xstat_val_t *get_val;\n+\tsfc_get_sw_stat_val_t *get_val;\n };\n \n-static sfc_get_sw_xstat_val_t sfc_get_sw_xstat_val_rx_dbells;\n+static sfc_get_sw_stat_val_t sfc_get_sw_stat_val_rx_dbells;\n static uint64_t\n-sfc_get_sw_xstat_val_rx_dbells(struct sfc_adapter *sa, uint16_t qid)\n+sfc_get_sw_stat_val_rx_dbells(struct sfc_adapter *sa, uint16_t qid)\n {\n \tstruct sfc_adapter_shared *sas = sfc_sa2shared(sa);\n \tstruct sfc_rxq_info *rxq_info;\n@@ -36,9 +36,9 @@ sfc_get_sw_xstat_val_rx_dbells(struct sfc_adapter *sa, uint16_t qid)\n \treturn 0;\n }\n \n-static sfc_get_sw_xstat_val_t sfc_get_sw_xstat_val_tx_dbells;\n+static sfc_get_sw_stat_val_t sfc_get_sw_stat_val_tx_dbells;\n static uint64_t\n-sfc_get_sw_xstat_val_tx_dbells(struct sfc_adapter *sa, uint16_t qid)\n+sfc_get_sw_stat_val_tx_dbells(struct sfc_adapter *sa, uint16_t qid)\n {\n \tstruct sfc_adapter_shared *sas = sfc_sa2shared(sa);\n \tstruct sfc_txq_info *txq_info;\n@@ -49,28 +49,28 @@ sfc_get_sw_xstat_val_tx_dbells(struct sfc_adapter *sa, uint16_t qid)\n \treturn 0;\n }\n \n-struct sfc_sw_xstat_descr sfc_sw_stats_descr[] = {\n+struct sfc_sw_stat_descr sfc_sw_stats_descr[] = {\n \t{\n \t\t.name = \"dbells\",\n \t\t.type = SFC_SW_STATS_RX,\n-\t\t.get_val = sfc_get_sw_xstat_val_rx_dbells,\n+\t\t.get_val = sfc_get_sw_stat_val_rx_dbells,\n \t},\n \t{\n \t\t.name = \"dbells\",\n \t\t.type = SFC_SW_STATS_TX,\n-\t\t.get_val = sfc_get_sw_xstat_val_tx_dbells,\n+\t\t.get_val = sfc_get_sw_stat_val_tx_dbells,\n \t}\n };\n \n static int\n sfc_sw_stat_get_name(struct sfc_adapter *sa,\n-\t\t const struct sfc_sw_xstat_descr *sw_xstat, char *name,\n+\t\t const struct sfc_sw_stat_descr *sw_stat, char *name,\n \t\t size_t name_size, unsigned int id_off)\n {\n \tconst char *prefix;\n \tint ret;\n \n-\tswitch (sw_xstat->type) {\n+\tswitch (sw_stat->type) {\n \tcase SFC_SW_STATS_RX:\n \t\tprefix = \"rx\";\n \t\tbreak;\n@@ -79,25 +79,25 @@ sfc_sw_stat_get_name(struct sfc_adapter *sa,\n \t\tbreak;\n \tdefault:\n \t\tsfc_err(sa, \"%s: unknown software statistics type %d\",\n-\t\t\t__func__, sw_xstat->type);\n+\t\t\t__func__, sw_stat->type);\n \t\treturn -EINVAL;\n \t}\n \n \tif (id_off == 0) {\n \t\tret = snprintf(name, name_size, \"%s_%s\", prefix,\n-\t\t\t\t\t\t\t sw_xstat->name);\n+\t\t\t\t\t\t\t sw_stat->name);\n \t\tif (ret < 0 || ret >= (int)name_size) {\n \t\t\tsfc_err(sa, \"%s: failed to fill xstat name %s_%s, err %d\",\n-\t\t\t\t__func__, prefix, sw_xstat->name, ret);\n+\t\t\t\t__func__, prefix, sw_stat->name, ret);\n \t\t\treturn ret > 0 ? -EINVAL : ret;\n \t\t}\n \t} else {\n \t\tuint16_t qid = id_off - 1;\n \t\tret = snprintf(name, name_size, \"%s_q%u_%s\", prefix, qid,\n-\t\t\t\t\t\t\tsw_xstat->name);\n+\t\t\t\t\t\t\tsw_stat->name);\n \t\tif (ret < 0 || ret >= (int)name_size) {\n \t\t\tsfc_err(sa, \"%s: failed to fill xstat name %s_q%u_%s, err %d\",\n-\t\t\t\t__func__, prefix, qid, sw_xstat->name, ret);\n+\t\t\t\t__func__, prefix, qid, sw_stat->name, ret);\n \t\t\treturn ret > 0 ? -EINVAL : ret;\n \t\t}\n \t}\n@@ -107,18 +107,18 @@ sfc_sw_stat_get_name(struct sfc_adapter *sa,\n \n static unsigned int\n sfc_sw_stat_get_queue_count(struct sfc_adapter *sa,\n-\t\t\t const struct sfc_sw_xstat_descr *sw_xstat)\n+\t\t\t const struct sfc_sw_stat_descr *sw_stat)\n {\n \tstruct sfc_adapter_shared *sas = sfc_sa2shared(sa);\n \n-\tswitch (sw_xstat->type) {\n+\tswitch (sw_stat->type) {\n \tcase SFC_SW_STATS_RX:\n \t\treturn sas->ethdev_rxq_count;\n \tcase SFC_SW_STATS_TX:\n \t\treturn sas->ethdev_txq_count;\n \tdefault:\n \t\tsfc_err(sa, \"%s: unknown software statistics type %d\",\n-\t\t\t__func__, sw_xstat->type);\n+\t\t\t__func__, sw_stat->type);\n \t\treturn 0;\n \t}\n }\n@@ -132,17 +132,17 @@ sfc_sw_xstat_per_queue_get_count(unsigned int nb_queues)\n \n static unsigned int\n sfc_sw_xstat_get_nb_supported(struct sfc_adapter *sa,\n-\t\t\t const struct sfc_sw_xstat_descr *sw_xstat)\n+\t\t\t const struct sfc_sw_stat_descr *sw_stat)\n {\n \tunsigned int nb_queues;\n \n-\tnb_queues = sfc_sw_stat_get_queue_count(sa, sw_xstat);\n+\tnb_queues = sfc_sw_stat_get_queue_count(sa, sw_stat);\n \treturn sfc_sw_xstat_per_queue_get_count(nb_queues);\n }\n \n static int\n sfc_sw_stat_get_names(struct sfc_adapter *sa,\n-\t\t const struct sfc_sw_xstat_descr *sw_xstat,\n+\t\t const struct sfc_sw_stat_descr *sw_stat,\n \t\t struct rte_eth_xstat_name *xstats_names,\n \t\t unsigned int xstats_names_sz,\n \t\t unsigned int *nb_written,\n@@ -154,7 +154,7 @@ sfc_sw_stat_get_names(struct sfc_adapter *sa,\n \tunsigned int qid;\n \tint rc;\n \n-\tnb_queues = sfc_sw_stat_get_queue_count(sa, sw_xstat);\n+\tnb_queues = sfc_sw_stat_get_queue_count(sa, sw_stat);\n \tif (nb_queues == 0)\n \t\treturn 0;\n \t*nb_supported += sfc_sw_xstat_per_queue_get_count(nb_queues);\n@@ -164,7 +164,7 @@ sfc_sw_stat_get_names(struct sfc_adapter *sa,\n \t * followed by per-queue xstats.\n \t */\n \tif (*nb_written < xstats_names_sz) {\n-\t\trc = sfc_sw_stat_get_name(sa, sw_xstat,\n+\t\trc = sfc_sw_stat_get_name(sa, sw_stat,\n \t\t\t\t\t xstats_names[*nb_written].name,\n \t\t\t\t\t name_size, *nb_written - id_base);\n \t\tif (rc != 0)\n@@ -174,7 +174,7 @@ sfc_sw_stat_get_names(struct sfc_adapter *sa,\n \n \tfor (qid = 0; qid < nb_queues; ++qid) {\n \t\tif (*nb_written < xstats_names_sz) {\n-\t\t\trc = sfc_sw_stat_get_name(sa, sw_xstat,\n+\t\t\trc = sfc_sw_stat_get_name(sa, sw_stat,\n \t\t\t\t\t xstats_names[*nb_written].name,\n \t\t\t\t\t name_size, *nb_written - id_base);\n \t\t\tif (rc != 0)\n@@ -188,7 +188,7 @@ sfc_sw_stat_get_names(struct sfc_adapter *sa,\n \n static int\n sfc_sw_xstat_get_names_by_id(struct sfc_adapter *sa,\n-\t\t\t const struct sfc_sw_xstat_descr *sw_xstat,\n+\t\t\t const struct sfc_sw_stat_descr *sw_stat,\n \t\t\t const uint64_t *ids,\n \t\t\t struct rte_eth_xstat_name *xstats_names,\n \t\t\t unsigned int size,\n@@ -200,7 +200,7 @@ sfc_sw_xstat_get_names_by_id(struct sfc_adapter *sa,\n \tunsigned int i;\n \tint rc;\n \n-\tnb_queues = sfc_sw_stat_get_queue_count(sa, sw_xstat);\n+\tnb_queues = sfc_sw_stat_get_queue_count(sa, sw_stat);\n \tif (nb_queues == 0)\n \t\treturn 0;\n \t*nb_supported += sfc_sw_xstat_per_queue_get_count(nb_queues);\n@@ -211,7 +211,7 @@ sfc_sw_xstat_get_names_by_id(struct sfc_adapter *sa,\n \t */\n \tfor (i = 0; i < size; i++) {\n \t\tif (id_base <= ids[i] && ids[i] <= id_base + nb_queues) {\n-\t\t\trc = sfc_sw_stat_get_name(sa, sw_xstat,\n+\t\t\trc = sfc_sw_stat_get_name(sa, sw_stat,\n \t\t\t\t\t\t xstats_names[i].name,\n \t\t\t\t\t\t name_size, ids[i] - id_base);\n \t\t\tif (rc != 0)\n@@ -224,7 +224,7 @@ sfc_sw_xstat_get_names_by_id(struct sfc_adapter *sa,\n \n static void\n sfc_sw_xstat_get_values(struct sfc_adapter *sa,\n-\t\t\tconst struct sfc_sw_xstat_descr *sw_xstat,\n+\t\t\tconst struct sfc_sw_stat_descr *sw_stat,\n \t\t\tstruct rte_eth_xstat *xstats,\n \t\t\tunsigned int xstats_size,\n \t\t\tunsigned int *nb_written,\n@@ -236,7 +236,7 @@ sfc_sw_xstat_get_values(struct sfc_adapter *sa,\n \tbool count_total_value = false;\n \tunsigned int nb_queues;\n \n-\tnb_queues = sfc_sw_stat_get_queue_count(sa, sw_xstat);\n+\tnb_queues = sfc_sw_stat_get_queue_count(sa, sw_stat);\n \tif (nb_queues == 0)\n \t\treturn;\n \t*nb_supported += sfc_sw_xstat_per_queue_get_count(nb_queues);\n@@ -254,7 +254,7 @@ sfc_sw_xstat_get_values(struct sfc_adapter *sa,\n \t}\n \n \tfor (qid = 0; qid < nb_queues; ++qid) {\n-\t\tvalue = sw_xstat->get_val(sa, qid);\n+\t\tvalue = sw_stat->get_val(sa, qid);\n \n \t\tif (*nb_written < xstats_size) {\n \t\t\txstats[*nb_written].id = *nb_written;\n@@ -269,14 +269,14 @@ sfc_sw_xstat_get_values(struct sfc_adapter *sa,\n \n static void\n sfc_sw_xstat_get_values_by_id(struct sfc_adapter *sa,\n-\t\t\t const struct sfc_sw_xstat_descr *sw_xstat,\n+\t\t\t const struct sfc_sw_stat_descr *sw_stat,\n \t\t\t const uint64_t *ids,\n \t\t\t uint64_t *values,\n \t\t\t unsigned int ids_size,\n \t\t\t unsigned int *nb_supported)\n {\n-\trte_spinlock_t *bmp_lock = &sa->sw_xstats.queues_bitmap_lock;\n-\tstruct rte_bitmap *bmp = sa->sw_xstats.queues_bitmap;\n+\trte_spinlock_t *bmp_lock = &sa->sw_stats.queues_bitmap_lock;\n+\tstruct rte_bitmap *bmp = sa->sw_stats.queues_bitmap;\n \tunsigned int id_base = *nb_supported;\n \tbool count_total_value = false;\n \tunsigned int total_value_idx;\n@@ -288,7 +288,7 @@ sfc_sw_xstat_get_values_by_id(struct sfc_adapter *sa,\n \trte_spinlock_lock(bmp_lock);\n \trte_bitmap_reset(bmp);\n \n-\tnb_queues = sfc_sw_stat_get_queue_count(sa, sw_xstat);\n+\tnb_queues = sfc_sw_stat_get_queue_count(sa, sw_stat);\n \tif (nb_queues == 0)\n \t\tgoto unlock;\n \t*nb_supported += sfc_sw_xstat_per_queue_get_count(nb_queues);\n@@ -305,7 +305,7 @@ sfc_sw_xstat_get_values_by_id(struct sfc_adapter *sa,\n \t\t\t\tcontinue;\n \t\t\t}\n \t\t\tqid = ids[i] - id_base - 1;\n-\t\t\tvalues[i] = sw_xstat->get_val(sa, qid);\n+\t\t\tvalues[i] = sw_stat->get_val(sa, qid);\n \t\t\ttotal_value += values[i];\n \n \t\t\trte_bitmap_set(bmp, qid);\n@@ -317,7 +317,7 @@ sfc_sw_xstat_get_values_by_id(struct sfc_adapter *sa,\n \t\tfor (qid = 0; qid < nb_queues; ++qid) {\n \t\t\tif (rte_bitmap_get(bmp, qid) != 0)\n \t\t\t\tcontinue;\n-\t\t\tvalues[total_value_idx] += sw_xstat->get_val(sa, qid);\n+\t\t\tvalues[total_value_idx] += sw_stat->get_val(sa, qid);\n \t\t}\n \t\tvalues[total_value_idx] += total_value;\n \t}\n@@ -349,7 +349,7 @@ sfc_sw_xstats_get_vals(struct sfc_adapter *sa,\n \t\t unsigned int *nb_written,\n \t\t unsigned int *nb_supported)\n {\n-\tuint64_t *reset_vals = sa->sw_xstats.reset_vals;\n+\tuint64_t *reset_vals = sa->sw_stats.reset_vals;\n \tunsigned int sw_xstats_offset;\n \tunsigned int i;\n \n@@ -402,7 +402,7 @@ sfc_sw_xstats_get_vals_by_id(struct sfc_adapter *sa,\n \t\t\t unsigned int n,\n \t\t\t unsigned int *nb_supported)\n {\n-\tuint64_t *reset_vals = sa->sw_xstats.reset_vals;\n+\tuint64_t *reset_vals = sa->sw_stats.reset_vals;\n \tunsigned int sw_xstats_offset;\n \tunsigned int i;\n \n@@ -452,7 +452,7 @@ sfc_sw_xstats_get_names_by_id(struct sfc_adapter *sa,\n }\n \n static void\n-sfc_sw_xstat_reset(struct sfc_adapter *sa, struct sfc_sw_xstat_descr *sw_xstat,\n+sfc_sw_xstat_reset(struct sfc_adapter *sa, struct sfc_sw_stat_descr *sw_stat,\n \t\t uint64_t *reset_vals)\n {\n \tunsigned int nb_queues;\n@@ -461,7 +461,7 @@ sfc_sw_xstat_reset(struct sfc_adapter *sa, struct sfc_sw_xstat_descr *sw_xstat,\n \n \tSFC_ASSERT(sfc_adapter_is_locked(sa));\n \n-\tnb_queues = sfc_sw_stat_get_queue_count(sa, sw_xstat);\n+\tnb_queues = sfc_sw_stat_get_queue_count(sa, sw_stat);\n \tif (nb_queues == 0)\n \t\treturn;\n \n@@ -474,7 +474,7 @@ sfc_sw_xstat_reset(struct sfc_adapter *sa, struct sfc_sw_xstat_descr *sw_xstat,\n \treset_vals++;\n \n \tfor (qid = 0; qid < nb_queues; ++qid) {\n-\t\treset_vals[qid] = sw_xstat->get_val(sa, qid);\n+\t\treset_vals[qid] = sw_stat->get_val(sa, qid);\n \t\t*total_xstat_reset += reset_vals[qid];\n \t}\n }\n@@ -482,23 +482,23 @@ sfc_sw_xstat_reset(struct sfc_adapter *sa, struct sfc_sw_xstat_descr *sw_xstat,\n void\n sfc_sw_xstats_reset(struct sfc_adapter *sa)\n {\n-\tuint64_t *reset_vals = sa->sw_xstats.reset_vals;\n-\tstruct sfc_sw_xstat_descr *sw_xstat;\n+\tuint64_t *reset_vals = sa->sw_stats.reset_vals;\n+\tstruct sfc_sw_stat_descr *sw_stat;\n \tunsigned int i;\n \n \tSFC_ASSERT(sfc_adapter_is_locked(sa));\n \n \tfor (i = 0; i < RTE_DIM(sfc_sw_stats_descr); i++) {\n-\t\tsw_xstat = &sfc_sw_stats_descr[i];\n-\t\tsfc_sw_xstat_reset(sa, sw_xstat, reset_vals);\n-\t\treset_vals += sfc_sw_xstat_get_nb_supported(sa, sw_xstat);\n+\t\tsw_stat = &sfc_sw_stats_descr[i];\n+\t\tsfc_sw_xstat_reset(sa, sw_stat, reset_vals);\n+\t\treset_vals += sfc_sw_xstat_get_nb_supported(sa, sw_stat);\n \t}\n }\n \n int\n sfc_sw_xstats_configure(struct sfc_adapter *sa)\n {\n-\tuint64_t **reset_vals = &sa->sw_xstats.reset_vals;\n+\tuint64_t **reset_vals = &sa->sw_stats.reset_vals;\n \tsize_t nb_supported = 0;\n \tunsigned int i;\n \n@@ -519,15 +519,15 @@ sfc_sw_xstats_configure(struct sfc_adapter *sa)\n static void\n sfc_sw_xstats_free_queues_bitmap(struct sfc_adapter *sa)\n {\n-\trte_bitmap_free(sa->sw_xstats.queues_bitmap);\n-\trte_free(sa->sw_xstats.queues_bitmap_mem);\n+\trte_bitmap_free(sa->sw_stats.queues_bitmap);\n+\trte_free(sa->sw_stats.queues_bitmap_mem);\n }\n \n static int\n sfc_sw_xstats_alloc_queues_bitmap(struct sfc_adapter *sa)\n {\n-\tstruct rte_bitmap **queues_bitmap = &sa->sw_xstats.queues_bitmap;\n-\tvoid **queues_bitmap_mem = &sa->sw_xstats.queues_bitmap_mem;\n+\tstruct rte_bitmap **queues_bitmap = &sa->sw_stats.queues_bitmap;\n+\tvoid **queues_bitmap_mem = &sa->sw_stats.queues_bitmap_mem;\n \tuint32_t bmp_size;\n \tint rc;\n \n@@ -547,7 +547,7 @@ sfc_sw_xstats_alloc_queues_bitmap(struct sfc_adapter *sa)\n \t\tgoto fail;\n \t}\n \n-\trte_spinlock_init(&sa->sw_xstats.queues_bitmap_lock);\n+\trte_spinlock_init(&sa->sw_stats.queues_bitmap_lock);\n \treturn 0;\n \n fail:\n@@ -558,7 +558,7 @@ sfc_sw_xstats_alloc_queues_bitmap(struct sfc_adapter *sa)\n int\n sfc_sw_xstats_init(struct sfc_adapter *sa)\n {\n-\tsa->sw_xstats.reset_vals = NULL;\n+\tsa->sw_stats.reset_vals = NULL;\n \n \treturn sfc_sw_xstats_alloc_queues_bitmap(sa);\n }\n@@ -566,8 +566,8 @@ sfc_sw_xstats_init(struct sfc_adapter *sa)\n void\n sfc_sw_xstats_close(struct sfc_adapter *sa)\n {\n-\trte_free(sa->sw_xstats.reset_vals);\n-\tsa->sw_xstats.reset_vals = NULL;\n+\trte_free(sa->sw_stats.reset_vals);\n+\tsa->sw_stats.reset_vals = NULL;\n \n \tsfc_sw_xstats_free_queues_bitmap(sa);\n }\n", "prefixes": [ "03/11" ] }