From patchwork Mon Jul 31 09:43:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 129735 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id CBEEF42FA2; Mon, 31 Jul 2023 11:44:27 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 68EF94325D; Mon, 31 Jul 2023 11:44:21 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id D1AE640150 for ; Mon, 31 Jul 2023 11:44:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1690796659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fz4CbuIRDoUkkbqgfshlGUSF9znCaJjA2Uln0XBWzlg=; b=B21RcPcKMP7Splv/aa9NK8qWmfbs6X4IUfk78ZPXXATdA64w+MErLmFdSFWbs8ThpB5Cow K0BkGadCvued1zDXtDD3VDQs7/BHcW8nChejnJRgGfj3W/sfGAhwY6c0ZdXCH96k++Ky13 U9dXje55nO3zsq59OO2HyQ+J0v/CVtk= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-689-Nktt_zzoNOG2EdiFzFiIJQ-1; Mon, 31 Jul 2023 05:44:16 -0400 X-MC-Unique: Nktt_zzoNOG2EdiFzFiIJQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C4D82280460B; Mon, 31 Jul 2023 09:44:15 +0000 (UTC) Received: from dmarchan.redhat.com (unknown [10.45.224.120]) by smtp.corp.redhat.com (Postfix) with ESMTP id 132DBC57964; Mon, 31 Jul 2023 09:44:14 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: thomas@monjalon.net, Ciara Power Subject: [PATCH 2/3] telemetry: remove v23 ABI compatibility Date: Mon, 31 Jul 2023 11:43:54 +0200 Message-ID: <20230731094356.1220807-3-david.marchand@redhat.com> In-Reply-To: <20230731094356.1220807-1-david.marchand@redhat.com> References: <20230731094356.1220807-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org v23.11 is a ABI breaking release, remove compatibility code for the previous major ABI version. Signed-off-by: David Marchand Acked-by: Bruce Richardson --- lib/telemetry/meson.build | 1 - lib/telemetry/telemetry_data.c | 33 ++++----------------------------- lib/telemetry/telemetry_data.h | 6 ------ lib/telemetry/version.map | 9 +-------- 4 files changed, 5 insertions(+), 44 deletions(-) diff --git a/lib/telemetry/meson.build b/lib/telemetry/meson.build index 73750d9ef4..f84c9aa3be 100644 --- a/lib/telemetry/meson.build +++ b/lib/telemetry/meson.build @@ -6,4 +6,3 @@ includes = [global_inc] sources = files('telemetry.c', 'telemetry_data.c', 'telemetry_legacy.c') headers = files('rte_telemetry.h') includes += include_directories('../metrics') -use_function_versioning = true diff --git a/lib/telemetry/telemetry_data.c b/lib/telemetry/telemetry_data.c index 0c7187bec1..3b1a2408df 100644 --- a/lib/telemetry/telemetry_data.c +++ b/lib/telemetry/telemetry_data.c @@ -10,7 +10,6 @@ #undef RTE_USE_LIBBSD #include -#include #include #include "telemetry_data.h" @@ -63,8 +62,8 @@ rte_tel_data_add_array_string(struct rte_tel_data *d, const char *str) return bytes < RTE_TEL_MAX_STRING_LEN ? 0 : E2BIG; } -int __vsym -rte_tel_data_add_array_int_v24(struct rte_tel_data *d, int64_t x) +int +rte_tel_data_add_array_int(struct rte_tel_data *d, int64_t x) { if (d->type != TEL_ARRAY_INT) return -EINVAL; @@ -74,18 +73,6 @@ rte_tel_data_add_array_int_v24(struct rte_tel_data *d, int64_t x) return 0; } -int __vsym -rte_tel_data_add_array_int_v23(struct rte_tel_data *d, int x) -{ - return rte_tel_data_add_array_int_v24(d, x); -} - -/* mark the v23 function as the older version, and v24 as the default version */ -VERSION_SYMBOL(rte_tel_data_add_array_int, _v23, 23); -BIND_DEFAULT_SYMBOL(rte_tel_data_add_array_int, _v24, 24); -MAP_STATIC_SYMBOL(int rte_tel_data_add_array_int(struct rte_tel_data *d, - int64_t x), rte_tel_data_add_array_int_v24); - int rte_tel_data_add_array_uint(struct rte_tel_data *d, uint64_t x) { @@ -190,8 +177,8 @@ rte_tel_data_add_dict_string(struct rte_tel_data *d, const char *name, return 0; } -int __vsym -rte_tel_data_add_dict_int_v24(struct rte_tel_data *d, const char *name, int64_t val) +int +rte_tel_data_add_dict_int(struct rte_tel_data *d, const char *name, int64_t val) { struct tel_dict_entry *e = &d->data.dict[d->data_len]; if (d->type != TEL_DICT) @@ -209,18 +196,6 @@ rte_tel_data_add_dict_int_v24(struct rte_tel_data *d, const char *name, int64_t return bytes < RTE_TEL_MAX_STRING_LEN ? 0 : E2BIG; } -int __vsym -rte_tel_data_add_dict_int_v23(struct rte_tel_data *d, const char *name, int val) -{ - return rte_tel_data_add_dict_int_v24(d, name, val); -} - -/* mark the v23 function as the older version, and v24 as the default version */ -VERSION_SYMBOL(rte_tel_data_add_dict_int, _v23, 23); -BIND_DEFAULT_SYMBOL(rte_tel_data_add_dict_int, _v24, 24); -MAP_STATIC_SYMBOL(int rte_tel_data_add_dict_int(struct rte_tel_data *d, - const char *name, int64_t val), rte_tel_data_add_dict_int_v24); - int rte_tel_data_add_dict_uint(struct rte_tel_data *d, const char *name, uint64_t val) diff --git a/lib/telemetry/telemetry_data.h b/lib/telemetry/telemetry_data.h index 53e4cabea5..205509c5a2 100644 --- a/lib/telemetry/telemetry_data.h +++ b/lib/telemetry/telemetry_data.h @@ -49,10 +49,4 @@ struct rte_tel_data { } data; /* data container */ }; -/* versioned functions */ -int rte_tel_data_add_array_int_v23(struct rte_tel_data *d, int val); -int rte_tel_data_add_array_int_v24(struct rte_tel_data *d, int64_t val); -int rte_tel_data_add_dict_int_v23(struct rte_tel_data *d, const char *name, int val); -int rte_tel_data_add_dict_int_v24(struct rte_tel_data *d, const char *name, int64_t val); - #endif diff --git a/lib/telemetry/version.map b/lib/telemetry/version.map index af978b883d..7d12c92905 100644 --- a/lib/telemetry/version.map +++ b/lib/telemetry/version.map @@ -1,4 +1,4 @@ -DPDK_23 { +DPDK_24 { global: rte_tel_data_add_array_container; @@ -31,13 +31,6 @@ EXPERIMENTAL { local: *; }; -DPDK_24 { - global: - - rte_tel_data_add_array_int; - rte_tel_data_add_dict_int; -} DPDK_23; - INTERNAL { rte_telemetry_legacy_register; rte_telemetry_init;