From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753040AbdBJIqq (ORCPT ); Fri, 10 Feb 2017 03:46:46 -0500 Received: from terminus.zytor.com ([65.50.211.136]:53620 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752636AbdBJIqm (ORCPT ); Fri, 10 Feb 2017 03:46:42 -0500 Date: Thu, 9 Feb 2017 23:47:43 -0800 From: tip-bot for David Carrillo-Cisneros Message-ID: Cc: davidcc@google.com, mmarek@suse.com, wangnan0@huawei.com, hpa@zytor.com, acme@redhat.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, pjt@google.com, eranian@google.com, peterz@infradead.org, hekuang@huawei.com, jolsa@kernel.org, alexander.shishkin@linux.intel.com, mingo@kernel.org, u.kleine-koenig@pengutronix.de Reply-To: alexander.shishkin@linux.intel.com, mingo@kernel.org, u.kleine-koenig@pengutronix.de, davidcc@google.com, wangnan0@huawei.com, mmarek@suse.com, hpa@zytor.com, acme@redhat.com, tglx@linutronix.de, pjt@google.com, hekuang@huawei.com, peterz@infradead.org, eranian@google.com, linux-kernel@vger.kernel.org, jolsa@kernel.org In-Reply-To: <20170208052840.112182-1-davidcc@google.com> References: <20170208052840.112182-1-davidcc@google.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools lib traceevent: Robustify do_generate_dynamic_list_file Git-Commit-ID: 6467753d613993f30965d4e0717f7304eb933ef7 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 6467753d613993f30965d4e0717f7304eb933ef7 Gitweb: http://git.kernel.org/tip/6467753d613993f30965d4e0717f7304eb933ef7 Author: David Carrillo-Cisneros AuthorDate: Tue, 7 Feb 2017 21:28:40 -0800 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 8 Feb 2017 10:27:45 -0300 tools lib traceevent: Robustify do_generate_dynamic_list_file The dynamic-list-file used to export dynamic symbols introduced in commit e3d09ec8126f ("tools lib traceevent: Export dynamic symbols used by traceevent plugins") is generated without any sort of error checking. I experienced problems due to an old version of nm (v 0.158) that outputs in a format distinct from the assumed by the script. Robustify the built of dynamic symbol list by enforcing that the second column of $(NM) -u is either "U" (Undefined), "W" or "w" (undefined weak), which are the possible outputs from non-ancient $(NM) versions. Print an error if format is unexpected. v2: Accept "W" and "w" symbol options. Signed-off-by: David Carrillo-Cisneros Tested-by: Arnaldo Carvalho de Melo Cc: Alexander Shishkin Cc: He Kuang Cc: Jiri Olsa Cc: Michal Marek Cc: Paul Turner Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Uwe Kleine-König Cc: Wang Nan Link: http://lkml.kernel.org/r/20170208052840.112182-1-davidcc@google.com [ Use STRING1 = STRING1 instead of == to make this work on Ubuntu systems ] Signed-off-by: Arnaldo Carvalho de Melo --- tools/lib/traceevent/Makefile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile index 2616c66..47076b1 100644 --- a/tools/lib/traceevent/Makefile +++ b/tools/lib/traceevent/Makefile @@ -257,10 +257,16 @@ define do_install_plugins endef define do_generate_dynamic_list_file - (echo '{'; \ - $(NM) -u -D $1 | awk 'NF>1 {print "\t"$$2";"}' | sort -u; \ - echo '};'; \ - ) > $2 + symbol_type=`$(NM) -u -D $1 | awk 'NF>1 {print $$1}' | \ + xargs echo "U W w" | tr ' ' '\n' | sort -u | xargs echo`;\ + if [ "$$symbol_type" = "U W w" ];then \ + (echo '{'; \ + $(NM) -u -D $1 | awk 'NF>1 {print "\t"$$2";"}' | sort -u;\ + echo '};'; \ + ) > $2; \ + else \ + (echo Either missing one of [$1] or bad version of $(NM)) 1>&2;\ + fi endef install_lib: all_cmd install_plugins