From patchwork Fri Aug 11 15:49:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 130168 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 B2C8C43035; Fri, 11 Aug 2023 17:49:52 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8EBD440E03; Fri, 11 Aug 2023 17:49:52 +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 865B240144 for ; Fri, 11 Aug 2023 17:49:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691768990; 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; bh=wFEIb71wb6zuXA99YEXCU53bcO+IOv5NXjESN19P5VY=; b=YkMFN3tlRIRo5BsPA3MlPm3nKn4TgOf457gO6uc4mzDV5HmSkt4lpWzoXz1B9JG0YUmehk gvp00PpW9x/LEiYrmEUUz9sQtEyCBBh8Cr9bFK8HYRgVcl2aH1/knFPMgV40U4cZxM3dLq +TwmdS4nEg7xT46SOP3ex6om2gpYWG0= 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-435-x8-Xc7_ZMjqb9-jrz0Cnew-1; Fri, 11 Aug 2023 11:49:48 -0400 X-MC-Unique: x8-Xc7_ZMjqb9-jrz0Cnew-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7D3B63C11A14; Fri, 11 Aug 2023 15:49:48 +0000 (UTC) Received: from dmarchan.redhat.com (unknown [10.39.192.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id BB8EA1121314; Fri, 11 Aug 2023 15:49:47 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: Bruce Richardson , Thomas Monjalon Subject: [PATCH] devtools: list symbols by version Date: Fri, 11 Aug 2023 17:49:44 +0200 Message-ID: <20230811154944.2947783-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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 Make it easier to list experimental symbols added in a certain version. While at it, add a check on map symbol files content to avoid breaking this listing tool. Example: $ ./buildtools/map-list-symbol.sh -V 18.11 lib/eal/version.map lib/eal/version.map EXPERIMENTAL rte_dev_event_callback_process lib/eal/version.map EXPERIMENTAL rte_dev_hotplug_handle_disable lib/eal/version.map EXPERIMENTAL rte_dev_hotplug_handle_enable Signed-off-by: David Marchand Acked-by: Stephen Hemminger --- buildtools/map-list-symbol.sh | 39 ++++++++++++++++++++++------------- devtools/check-symbol-maps.sh | 21 +++++++++++++++++++ 2 files changed, 46 insertions(+), 14 deletions(-) diff --git a/buildtools/map-list-symbol.sh b/buildtools/map-list-symbol.sh index 3bf9bd66f8..a834399816 100755 --- a/buildtools/map-list-symbol.sh +++ b/buildtools/map-list-symbol.sh @@ -6,7 +6,7 @@ section=all symbol=all quiet= -while getopts 'S:s:q' name; do +while getopts 'S:s:qV:' name; do case $name in S) [ $section = 'all' ] || { @@ -25,8 +25,11 @@ while getopts 'S:s:q' name; do q) quiet='y' ;; + V) + version=$OPTARG + ;; ?) - echo 'usage: $0 [-S section] [-s symbol] [-q]' + echo 'usage: $0 [-S section] [-s symbol] [-V version] [-q]' exit 1 ;; esac @@ -38,7 +41,8 @@ for file in $@; do cat "$file" |awk ' BEGIN { current_section = ""; - if ("'$section'" == "all" && "'$symbol'" == "all") { + current_version = ""; + if ("'$section'" == "all" && "'$symbol'" == "all" && "'$version'" == "") { ret = 0; } else { ret = 1; @@ -49,18 +53,25 @@ for file in $@; do current_section = $1; } } - /.*}/ { current_section = ""; } + /.*}/ { current_section = ""; current_version = ""; } + /^\t# added in / { + current_version=$4; + } /^[^}].*[^:*];/ { - if (current_section != "") { - gsub(";",""); - if ("'$symbol'" == "all" || $1 == "'$symbol'") { - ret = 0; - if ("'$quiet'" == "") { - print "'$file' "current_section" "$1; - } - if ("'$symbol'" != "all") { - exit 0; - } + if (current_section == "") { + next; + } + if ("'$version'" != "" && "'$version'" != current_version) { + next; + } + gsub(";",""); + if ("'$symbol'" == "all" || $1 == "'$symbol'") { + ret = 0; + if ("'$quiet'" == "") { + print "'$file' "current_section" "$1; + } + if ("'$symbol'" != "all") { + exit 0; } } } diff --git a/devtools/check-symbol-maps.sh b/devtools/check-symbol-maps.sh index 8c116bfa9c..01cd09768d 100755 --- a/devtools/check-symbol-maps.sh +++ b/devtools/check-symbol-maps.sh @@ -74,4 +74,25 @@ if [ -n "$empty_maps" ] ; then ret=1 fi +find_bad_format_maps () +{ + for map in $@ ; do + cat $map | awk ' + /^(DPDK_[0-9]*|EXPERIMENTAL|INTERNAL) {$/ { next; } # start of a section + /^};$/ { next; } # end of a section + /^$/ { next; } # empty line + /^\t(global:|local: \*;)$/ { next; } # qualifiers + /^\t[a-zA-Z_0-9]*;(| # WINDOWS_NO_EXPORT)$/ { next; } # symbols + /^\t# added in [0-9]*\.[0-9]*$/ { next; } # version comments + { exit 1; }' || echo $map + done +} + +bad_format_maps=$(find_bad_format_maps $@) +if [ -n "$bad_format_maps" ] ; then + echo "Found badly formatted maps:" + echo "$bad_format_maps" + ret=1 +fi + exit $ret From patchwork Wed Aug 16 07:16:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 130402 X-Patchwork-Delegate: thomas@monjalon.net 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 AC00F4307C; Wed, 16 Aug 2023 09:16:13 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 83B5840EF0; Wed, 16 Aug 2023 09:16:13 +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 2216340041 for ; Wed, 16 Aug 2023 09:16:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692170171; 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=ffTtxlCEqecE/ByNKUBa9cW1IkSxbl6OkeDKoafIZ3k=; b=HoPWcxh8AaHcdN7fUPxp8CQj9jP+Y6hPPgyQCc0hqMUPjIAJ9nxmYrcjuELQcxVAwD0k1M UXpcAaNuXMP4RvH5Bgcq06CSTO9SqnhjDugMigHTLfbniMyYFA77mLcvk8zpAc2r20MylJ /PJ8i4NWq2m/czvKHh0jwlTnX4x2Wfc= 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-595-3BtSOHIQNki8kh7TnIfshg-1; Wed, 16 Aug 2023 03:16:10 -0400 X-MC-Unique: 3BtSOHIQNki8kh7TnIfshg-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0FE811C068E0; Wed, 16 Aug 2023 07:16:10 +0000 (UTC) Received: from dmarchan.redhat.com (unknown [10.45.226.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 39C3F401E6A; Wed, 16 Aug 2023 07:16:09 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: Stephen Hemminger , Bruce Richardson Subject: [PATCH v4 2/2] devtools: list symbols by version Date: Wed, 16 Aug 2023 09:16:03 +0200 Message-ID: <20230816071603.1002271-2-david.marchand@redhat.com> In-Reply-To: <20230816071603.1002271-1-david.marchand@redhat.com> References: <20230811154944.2947783-1-david.marchand@redhat.com> <20230816071603.1002271-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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 Make it easier to list experimental symbols added in a certain version. Example: $ ./buildtools/map-list-symbol.sh -V 18.11 lib/eal/version.map lib/eal/version.map EXPERIMENTAL rte_dev_event_callback_process lib/eal/version.map EXPERIMENTAL rte_dev_hotplug_handle_disable lib/eal/version.map EXPERIMENTAL rte_dev_hotplug_handle_enable Signed-off-by: David Marchand Acked-by: Stephen Hemminger --- buildtools/map-list-symbol.sh | 39 ++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/buildtools/map-list-symbol.sh b/buildtools/map-list-symbol.sh index 3bf9bd66f8..a834399816 100755 --- a/buildtools/map-list-symbol.sh +++ b/buildtools/map-list-symbol.sh @@ -6,7 +6,7 @@ section=all symbol=all quiet= -while getopts 'S:s:q' name; do +while getopts 'S:s:qV:' name; do case $name in S) [ $section = 'all' ] || { @@ -25,8 +25,11 @@ while getopts 'S:s:q' name; do q) quiet='y' ;; + V) + version=$OPTARG + ;; ?) - echo 'usage: $0 [-S section] [-s symbol] [-q]' + echo 'usage: $0 [-S section] [-s symbol] [-V version] [-q]' exit 1 ;; esac @@ -38,7 +41,8 @@ for file in $@; do cat "$file" |awk ' BEGIN { current_section = ""; - if ("'$section'" == "all" && "'$symbol'" == "all") { + current_version = ""; + if ("'$section'" == "all" && "'$symbol'" == "all" && "'$version'" == "") { ret = 0; } else { ret = 1; @@ -49,18 +53,25 @@ for file in $@; do current_section = $1; } } - /.*}/ { current_section = ""; } + /.*}/ { current_section = ""; current_version = ""; } + /^\t# added in / { + current_version=$4; + } /^[^}].*[^:*];/ { - if (current_section != "") { - gsub(";",""); - if ("'$symbol'" == "all" || $1 == "'$symbol'") { - ret = 0; - if ("'$quiet'" == "") { - print "'$file' "current_section" "$1; - } - if ("'$symbol'" != "all") { - exit 0; - } + if (current_section == "") { + next; + } + if ("'$version'" != "" && "'$version'" != current_version) { + next; + } + gsub(";",""); + if ("'$symbol'" == "all" || $1 == "'$symbol'") { + ret = 0; + if ("'$quiet'" == "") { + print "'$file' "current_section" "$1; + } + if ("'$symbol'" != "all") { + exit 0; } } }