From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id E725FA0583; Thu, 19 Mar 2020 18:34:54 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BFE29292D; Thu, 19 Mar 2020 18:34:54 +0100 (CET) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id DE31BF90 for ; Thu, 19 Mar 2020 18:34:52 +0100 (CET) IronPort-SDR: hPiaqyog/WIh5QVJ7fOsYe8tsnIsMh41G0oQfrUSA5Oh7FoD8ORJqvoO3p1EWBY6xBInXjb1f6 y2udDFpvrGLA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Mar 2020 10:34:51 -0700 IronPort-SDR: /f3udLAW+uOCD2jOZCAsqwhrmY7j3iGwlUTVkM1k2k8FVELTycfxbnpSlztv//8Irsy5uWevIu HmODEcdXYZWQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,572,1574150400"; d="scan'208";a="391872557" Received: from silpixa00399953.ir.intel.com (HELO silpixa00399953.ger.corp.intel.com) ([10.237.222.53]) by orsmga004.jf.intel.com with ESMTP; 19 Mar 2020 10:34:50 -0700 From: Ciara Power To: kevin.laatz@intel.com Cc: dev@dpdk.org, reshma.pattan@intel.com, Ciara Power Date: Thu, 19 Mar 2020 17:18:55 +0000 Message-Id: <20200319171907.60891-1-ciara.power@intel.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 00/12] update and simplify telemetry library. X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patchset extensively reworks the telemetry library adding new functionality and simplifying much of the existing code, while maintaining backward compatibility. This work is based on the previously sent RFC for a "process info" library: https://patchwork.dpdk.org/project/dpdk/list/?series=7741 However, rather than creating a new library, this patchset takes that work and merges it into the existing telemetry library, as mentioned above. The telemetry library as shipped in 19.11 is based upon the metrics library and outputs all statistics based on that as a source. However, this limits the telemetry output to only port-level statistics information, rather than allowing it to be used as a general scheme for telemetry information across all DPDK libraries. With this patchset applied, rather than the telemetry library being responsible for pulling ethdev stats and pushing them into the metrics library for retrieval later, each library e.g. ethdev, rawdev, and even the metrics library itself (for backwards compatiblity) now handle their own stats. Any library or app can register a callback function with telemetry, which will be called if requested by the client connected via the telemetry socket. The callback function in the library/app then formats its stats, or other data, into a JSON string, and returns it to telemetry to be sent to the client. To maintain backward compatibility, e.g. to allow the dpdk telemetry collectd plugin to continue to work, some of the existing telemetry code is kept, but is moved into the metrics library, and callbacks are registered with telemetry for the legacy commands that were supported previously. The new version of the library, apart from the legacy interface support for backward compatibility, does not have an external dependency on the Jansson library, allowing the library to be enabled by default. Note: In this version of the patchset, telemetry output is provided by the ethdev, rawdev and eal libraries, but this may be expanded further in later versions which are planned ahead of the merge deadline for 20.05 Bruce Richardson (5): telemetry: invert dependency on metrics telemetry: introduce new telemetry functionality ethdev: add callback support for telemetry usertools: add new telemetry python script eal: add eal telemetry callbacks Ciara Power (7): telemetry: move code to metrics for later reuse metrics: reduce code taken from telemetry rawdev: add callback support for telemetry examples/l3fwd-power: enable use of new telemetry telemetry: introduce telemetry backward compatibility telemetry: remove existing telemetry files lib: add telemetry as eal dependency config/common_base | 2 +- examples/l3fwd-power/Makefile | 4 + examples/l3fwd-power/main.c | 62 +- examples/l3fwd-power/meson.build | 4 + lib/Makefile | 10 +- lib/librte_eal/common/eal_common_options.c | 79 + lib/librte_eal/common/eal_internal_cfg.h | 1 + lib/librte_eal/common/eal_options.h | 7 + lib/librte_eal/freebsd/eal/Makefile | 1 + lib/librte_eal/freebsd/eal/eal.c | 14 + lib/librte_eal/freebsd/eal/meson.build | 2 +- lib/librte_eal/linux/eal/Makefile | 1 + lib/librte_eal/linux/eal/eal.c | 14 + lib/librte_eal/linux/eal/meson.build | 2 +- lib/librte_eal/meson.build | 2 +- lib/librte_ethdev/Makefile | 4 + lib/librte_ethdev/meson.build | 4 + lib/librte_ethdev/rte_ethdev.c | 79 + lib/librte_metrics/Makefile | 14 + lib/librte_metrics/meson.build | 10 + lib/librte_metrics/rte_metrics.c | 6 +- lib/librte_metrics/rte_metrics.h | 5 +- lib/librte_metrics/rte_metrics_telemetry.c | 539 +++++ lib/librte_metrics/rte_metrics_telemetry.h | 65 + lib/librte_metrics/rte_metrics_version.map | 7 + lib/librte_rawdev/Makefile | 5 + lib/librte_rawdev/meson.build | 5 + lib/librte_rawdev/rte_rawdev.c | 88 + lib/librte_telemetry/Makefile | 12 +- lib/librte_telemetry/meson.build | 18 +- lib/librte_telemetry/rte_telemetry.c | 1895 ----------------- lib/librte_telemetry/rte_telemetry.h | 53 +- lib/librte_telemetry/rte_telemetry_internal.h | 112 - lib/librte_telemetry/rte_telemetry_legacy.h | 48 + lib/librte_telemetry/rte_telemetry_parser.c | 682 ------ lib/librte_telemetry/rte_telemetry_parser.h | 15 - .../rte_telemetry_parser_test.c | 533 ----- .../rte_telemetry_socket_tests.h | 36 - .../rte_telemetry_version.map | 5 +- lib/librte_telemetry/telemetry.c | 290 +++ lib/librte_telemetry/telemetry_legacy.c | 226 ++ lib/meson.build | 3 +- mk/rte.app.mk | 9 +- mk/rte.vars.mk | 2 + usertools/test_new_telemetry.py | 30 + 45 files changed, 1659 insertions(+), 3346 deletions(-) create mode 100644 lib/librte_metrics/rte_metrics_telemetry.c create mode 100644 lib/librte_metrics/rte_metrics_telemetry.h delete mode 100644 lib/librte_telemetry/rte_telemetry.c delete mode 100644 lib/librte_telemetry/rte_telemetry_internal.h create mode 100644 lib/librte_telemetry/rte_telemetry_legacy.h delete mode 100644 lib/librte_telemetry/rte_telemetry_parser.c delete mode 100644 lib/librte_telemetry/rte_telemetry_parser.h delete mode 100644 lib/librte_telemetry/rte_telemetry_parser_test.c delete mode 100644 lib/librte_telemetry/rte_telemetry_socket_tests.h create mode 100644 lib/librte_telemetry/telemetry.c create mode 100644 lib/librte_telemetry/telemetry_legacy.c create mode 100755 usertools/test_new_telemetry.py -- 2.17.1