Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/69267/?format=api
{ "id": 69267, "url": "https://patches.dpdk.org/api/patches/69267/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20200424124159.45989-13-ciara.power@intel.com/", "project": { "id": 1, "url": "https://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": "<20200424124159.45989-13-ciara.power@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200424124159.45989-13-ciara.power@intel.com", "date": "2020-04-24T12:41:53", "name": "[v4,12/18] examples/l3fwd-power: enable use of new telemetry", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "64666464e90ff8481eb19b3cf8703b66146b1508", "submitter": { "id": 978, "url": "https://patches.dpdk.org/api/people/978/?format=api", "name": "Power, Ciara", "email": "ciara.power@intel.com" }, "delegate": { "id": 1, "url": "https://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20200424124159.45989-13-ciara.power@intel.com/mbox/", "series": [ { "id": 9624, "url": "https://patches.dpdk.org/api/series/9624/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=9624", "date": "2020-04-24T12:41:41", "name": "update and simplify telemetry library.", "version": 4, "mbox": "https://patches.dpdk.org/series/9624/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/69267/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/69267/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id D677BA00C2;\n\tFri, 24 Apr 2020 15:04:15 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 13EC41D16F;\n\tFri, 24 Apr 2020 15:02:27 +0200 (CEST)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n by dpdk.org (Postfix) with ESMTP id BB1971C25A\n for <dev@dpdk.org>; Fri, 24 Apr 2020 15:02:12 +0200 (CEST)", "from orsmga007.jf.intel.com ([10.7.209.58])\n by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 24 Apr 2020 06:02:12 -0700", "from silpixa00399953.ir.intel.com (HELO\n silpixa00399953.ger.corp.intel.com) ([10.237.222.53])\n by orsmga007.jf.intel.com with ESMTP; 24 Apr 2020 06:02:10 -0700" ], "IronPort-SDR": [ "\n 7eHPQ9chJ+4Cral5FuVKEdwZ+CsOvhoI5h6WRDREO/Tq2ZEpx5AuR9RFdXLvNCXoAFMWynuuCe\n VdSrhOVK4X6g==", "\n /Y0deB7LtE8g+kZttWGgcnbTrQbezq7rRNo1iXJVC/OVLNeRO0JiKK0BJ6P4r9m5inzifAXTFo\n M9FWbQTLGy/g==" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.73,311,1583222400\"; d=\"scan'208\";a=\"245228341\"", "From": "Ciara Power <ciara.power@intel.com>", "To": "dev@dpdk.org,\n\tkevin.laatz@intel.com", "Cc": "reshma.pattan@intel.com, jerinjacobk@gmail.com, david.marchand@redhat.com,\n keith.wiles@intel.com, mb@smartsharesystems.com, thomas@monjalon.net,\n Ciara Power <ciara.power@intel.com>, david.hunt@intel.com,\n Bruce Richardson <bruce.richardson@intel.com>", "Date": "Fri, 24 Apr 2020 13:41:53 +0100", "Message-Id": "<20200424124159.45989-13-ciara.power@intel.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20200424124159.45989-1-ciara.power@intel.com>", "References": "<20200319171907.60891-1-ciara.power@intel.com>\n <20200424124159.45989-1-ciara.power@intel.com>", "Subject": "[dpdk-dev] [PATCH v4 12/18] examples/l3fwd-power: enable use of new\n\ttelemetry", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "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": "The l3fwd-power example app now registers a stats command with\ntelemetry, and provides a callback function to handle formatting the\npower stats.\n\nAn example usage is shown below:\n\nConnecting to /var/run/dpdk/rte/dpdk_telemetry.v2\n{\"version\": \"DPDK 20.05.0-rc0\", \"pid\": 63384, \"max_output_len\": 16384}\n--> /\n{\"/\": [\"/\", \"/ethdev/link_status\", \"/ethdev/list\", \"/ethdev/xstats\", \\\n \"/help\", \"/info\", \"/l3fwd-power/stats\", \"/rawdev/list\", \\\n \"/rawdev/xstats\"]}\n--> /l3fwd-power/stats\n{\"/l3fwd-power/stats\": {\"empty_poll\": 281625000, \"full_poll\": 0, \\\n \"busy_percent\": 0}}\n\nThe existing stats tracking done by the app using the metrics\nlibrary is unaffected. This will still be used to ensure backward\ncompatibility.\n\nCc: david.hunt@intel.com\n\nSigned-off-by: Bruce Richardson <bruce.richardson@intel.com>\nSigned-off-by: Ciara Power <ciara.power@intel.com>\n\n---\nv4: Modified to use binary data formatting instead of JSON.\n---\n examples/l3fwd-power/Makefile | 4 +++\n examples/l3fwd-power/main.c | 56 ++++++++++++++++++++++++--------\n examples/l3fwd-power/meson.build | 4 +++\n 3 files changed, 50 insertions(+), 14 deletions(-)", "diff": "diff --git a/examples/l3fwd-power/Makefile b/examples/l3fwd-power/Makefile\nindex 729d49639b..531a1d81cb 100644\n--- a/examples/l3fwd-power/Makefile\n+++ b/examples/l3fwd-power/Makefile\n@@ -68,6 +68,10 @@ ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y)\n CFLAGS_main.o += -Wno-return-type\n endif\n \n+ifeq ($(CONFIG_RTE_LIBRTE_TELEMETRY),y)\n+LDLIBS += -lrte_telemetry\n+endif\n+\n include $(RTE_SDK)/mk/rte.extapp.mk\n endif\n endif\ndiff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c\nindex b46aa7bac6..bfa72b3187 100644\n--- a/examples/l3fwd-power/main.c\n+++ b/examples/l3fwd-power/main.c\n@@ -46,6 +46,9 @@\n #include <rte_spinlock.h>\n #include <rte_power_empty_poll.h>\n #include <rte_metrics.h>\n+#ifdef RTE_LIBRTE_TELEMETRY\n+#include <rte_telemetry.h>\n+#endif\n \n #include \"perf_core.h\"\n #include \"main.h\"\n@@ -131,7 +134,7 @@\n #define EMPTY_POLL_MED_THRESHOLD 350000UL\n #define EMPTY_POLL_HGH_THRESHOLD 580000UL\n \n-\n+#define NUM_TELSTATS RTE_DIM(telstats_strings)\n \n static uint16_t nb_rxd = RTE_TEST_RX_DESC_DEFAULT;\n static uint16_t nb_txd = RTE_TEST_TX_DESC_DEFAULT;\n@@ -2079,14 +2082,11 @@ init_power_library(void)\n \treturn ret;\n }\n static void\n-update_telemetry(__rte_unused struct rte_timer *tim,\n-\t\t__rte_unused void *arg)\n+get_current_stat_values(uint64_t *values)\n {\n \tunsigned int lcore_id = rte_lcore_id();\n \tstruct lcore_conf *qconf;\n \tuint64_t app_eps = 0, app_fps = 0, app_br = 0;\n-\tuint64_t values[3] = {0};\n-\tint ret;\n \tuint64_t count = 0;\n \n \tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n@@ -2105,17 +2105,41 @@ update_telemetry(__rte_unused struct rte_timer *tim,\n \t\tvalues[0] = app_eps/count;\n \t\tvalues[1] = app_fps/count;\n \t\tvalues[2] = app_br/count;\n-\t} else {\n-\t\tvalues[0] = 0;\n-\t\tvalues[1] = 0;\n-\t\tvalues[2] = 0;\n-\t}\n+\t} else\n+\t\tmemset(values, 0, sizeof(uint64_t) * NUM_TELSTATS);\n+\n+}\n+\n+static void\n+update_telemetry(__rte_unused struct rte_timer *tim,\n+\t\t__rte_unused void *arg)\n+{\n+\tint ret;\n+\tuint64_t values[NUM_TELSTATS] = {0};\n \n+\tget_current_stat_values(values);\n \tret = rte_metrics_update_values(RTE_METRICS_GLOBAL, telstats_index,\n \t\t\t\t\tvalues, RTE_DIM(values));\n \tif (ret < 0)\n \t\tRTE_LOG(WARNING, POWER, \"failed to update metrcis\\n\");\n }\n+#ifdef RTE_LIBRTE_TELEMETRY\n+static int\n+handle_app_stats(const char *cmd __rte_unused,\n+\t\tconst char *params __rte_unused,\n+\t\tstruct rte_tel_data *d)\n+{\n+\tuint64_t values[NUM_TELSTATS] = {0};\n+\tuint32_t i;\n+\n+\trte_tel_data_start_dict(d);\n+\tget_current_stat_values(values);\n+\tfor (i = 0; i < NUM_TELSTATS; i++)\n+\t\trte_tel_data_add_dict_u64(d, telstats_strings[i].name,\n+\t\t\t\tvalues[i]);\n+\treturn 0;\n+}\n+#endif\n static void\n telemetry_setup_timer(void)\n {\n@@ -2203,8 +2227,7 @@ main(int argc, char **argv)\n \tuint32_t dev_rxq_num, dev_txq_num;\n \tuint8_t nb_rx_queue, queue, socketid;\n \tuint16_t portid;\n-\tuint8_t num_telstats = RTE_DIM(telstats_strings);\n-\tconst char *ptr_strings[num_telstats];\n+\tconst char *ptr_strings[NUM_TELSTATS];\n \n \t/* catch SIGINT and restore cpufreq governor to ondemand */\n \tsignal(SIGINT, signal_exit_now);\n@@ -2503,10 +2526,10 @@ main(int argc, char **argv)\n \t\t/* Init metrics library */\n \t\trte_metrics_init(rte_socket_id());\n \t\t/** Register stats with metrics library */\n-\t\tfor (i = 0; i < num_telstats; i++)\n+\t\tfor (i = 0; i < NUM_TELSTATS; i++)\n \t\t\tptr_strings[i] = telstats_strings[i].name;\n \n-\t\tret = rte_metrics_reg_names(ptr_strings, num_telstats);\n+\t\tret = rte_metrics_reg_names(ptr_strings, NUM_TELSTATS);\n \t\tif (ret >= 0)\n \t\t\ttelstats_index = ret;\n \t\telse\n@@ -2516,6 +2539,11 @@ main(int argc, char **argv)\n \t\t\trte_spinlock_init(&stats[lcore_id].telemetry_lock);\n \t\t}\n \t\trte_timer_init(&telemetry_timer);\n+#ifdef RTE_LIBRTE_TELEMETRY\n+\t\trte_telemetry_register_cmd(\"/l3fwd-power/stats\",\n+\t\t\t\thandle_app_stats,\n+\t\t\t\t\"Returns global power stats. Parameters: None\");\n+#endif\n \t\trte_eal_mp_remote_launch(main_telemetry_loop, NULL,\n \t\t\t\t\t\tSKIP_MASTER);\n \t}\ndiff --git a/examples/l3fwd-power/meson.build b/examples/l3fwd-power/meson.build\nindex d5a3d4bb2f..e7c6be6477 100644\n--- a/examples/l3fwd-power/meson.build\n+++ b/examples/l3fwd-power/meson.build\n@@ -16,3 +16,7 @@ deps += ['power', 'timer', 'lpm', 'hash', 'metrics']\n sources = files(\n \t'main.c', 'perf_core.c'\n )\n+\n+if dpdk_conf.has('RTE_LIBRTE_TELEMETRY')\n+\tdeps += ['telemetry']\n+endif\n", "prefixes": [ "v4", "12/18" ] }