Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1578293

[tip:perf/core] tools lib traceevent: Robustify do_generate_dynamic_list_file

Show all headers | View raw

Commit-ID:  6467753d613993f30965d4e0717f7304eb933ef7
Gitweb:     http://git.kernel.org/tip/6467753d613993f30965d4e0717f7304eb933ef7
Author:     David Carrillo-Cisneros <davidcc@google.com>
AuthorDate: Tue, 7 Feb 2017 21:28:40 -0800
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
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 <files> 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 <davidcc@google.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Michal Marek <mmarek@suse.com>
Cc: Paul Turner <pjt@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Wang Nan <wangnan0@huawei.com>
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 <acme@redhat.com>
---
 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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/4] Fixes for perf build and feature detection David Carrillo-Cisneros <davidcc@google.com> - 2017-02-02 07:40 +0100
  [PATCH 2/4] tools lib traceevent: Robustify do_generate_dynamic_list_file David Carrillo-Cisneros <davidcc@google.com> - 2017-02-02 07:40 +0100
    Re: [PATCH 2/4] tools lib traceevent: Robustify  do_generate_dynamic_list_file Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-02-06 18:50 +0100
  [PATCH 4/4] tools include: Fix include path for uapi/asm-generic/mman.h David Carrillo-Cisneros <davidcc@google.com> - 2017-02-02 07:40 +0100
    Re: [PATCH 4/4] tools include: Fix include path for  uapi/asm-generic/mman.h Jiri Olsa <jolsa@redhat.com> - 2017-02-02 14:00 +0100
    Re: [PATCH 4/4] tools include: Fix include path for  uapi/asm-generic/mman.h Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-02-06 19:30 +0100
      Re: [PATCH 4/4] tools include: Fix include path for uapi/asm-generic/mman.h David Carrillo-Cisneros <davidcc@google.com> - 2017-02-06 21:10 +0100
  [PATCH 1/4] perf tools: pass PYTHON config to feature detection David Carrillo-Cisneros <davidcc@google.com> - 2017-02-02 07:40 +0100
    Re: [PATCH 1/4] perf tools: pass PYTHON config to feature detection Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-02-06 14:20 +0100
      Re: [PATCH 1/4] perf tools: pass PYTHON config to feature detection Namhyung Kim <namhyung@kernel.org> - 2017-02-06 16:30 +0100
    Re: [PATCH 1/4] perf tools: pass PYTHON config to feature detection Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-02-07 20:50 +0100
      Re: [PATCH 1/4] perf tools: pass PYTHON config to feature detection David Carrillo-Cisneros <davidcc@google.com> - 2017-02-08 04:20 +0100
        [PATCH v2] tools lib traceevent: Robustify do_generate_dynamic_list_file David Carrillo-Cisneros <davidcc@google.com> - 2017-02-08 06:30 +0100
          Re: [PATCH v2] tools lib traceevent: Robustify  do_generate_dynamic_list_file Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-02-08 13:50 +0100
            Re: [PATCH v2] tools lib traceevent: Robustify  do_generate_dynamic_list_file Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-02-08 14:30 +0100
              Re: [PATCH v2] tools lib traceevent: Robustify do_generate_dynamic_list_file David Carrillo-Cisneros <davidcc@google.com> - 2017-02-09 06:20 +0100
          [tip:perf/core] tools lib traceevent: Robustify  do_generate_dynamic_list_file tip-bot for David Carrillo-Cisneros <tipbot@zytor.com> - 2017-02-10 09:50 +0100
  Re: [PATCH 0/4] Fixes for perf build and feature detection Jiri Olsa <jolsa@redhat.com> - 2017-02-02 14:00 +0100

csiph-web