iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/tools/perf
History
Vitaly Chikunov 5950c9d7f9 perf beauty: Fix fsconfig generator 
[ Upstream commit 2e1daee14e67fbf9b27280b974e2c680a22cabea ]

After gnulib update sed stopped matching `[[:space:]]*+' as before,
causing the following compilation error:

  In file included from builtin-trace.c:719:
  trace/beauty/generated/fsconfig_arrays.c:2:3: error: expected expression before ']' token
      2 |  [] = "",
	|   ^
  trace/beauty/generated/fsconfig_arrays.c:2:3: error: array index in initializer not of integer type
  trace/beauty/generated/fsconfig_arrays.c:2:3: note: (near initialization for 'fsconfig_cmds')

Fix this by correcting the regular expression used in the generator.
Also, clean up the script by removing redundant egrep, xargs, and printf
invocations.

Committer testing:

Continues to work:

  $ cat tools/perf/trace/beauty/fsconfig.sh
  #!/bin/sh
  # SPDX-License-Identifier: LGPL-2.1

  if [ $# -ne 1 ] ; then
  	linux_header_dir=tools/include/uapi/linux
  else
  	linux_header_dir=$1
  fi

  linux_mount=${linux_header_dir}/mount.h

  printf "static const char *fsconfig_cmds[] = {\n"
  ms='[[:space:]]*'
  sed -nr "s/^${ms}FSCONFIG_([[:alnum:]_]+)${ms}=${ms}([[:digit:]]+)${ms},.*/\t[\2] = \"\1\",/p" \
  	${linux_mount}
  printf "};\n"
  $ tools/perf/trace/beauty/fsconfig.sh
  static const char *fsconfig_cmds[] = {
  	[0] = "SET_FLAG",
  	[1] = "SET_STRING",
  	[2] = "SET_BINARY",
  	[3] = "SET_PATH",
  	[4] = "SET_PATH_EMPTY",
  	[5] = "SET_FD",
  	[6] = "CMD_CREATE",
  	[7] = "CMD_RECONFIGURE",
  };
  $

Fixes: d35293004a5e4 ("perf beauty: Add generator for fsconfig's 'cmd' arg values")
Signed-off-by: Vitaly Chikunov <vt@altlinux.org>
Co-authored-by: Dmitry V. Levin <ldv@altlinux.org>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Link: http://lore.kernel.org/lkml/20210414182723.1670663-1-vt@altlinux.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2021-05-14 09:44:30 +02:00
..
arch
perf tools: Fix record failure when mixed with ARM SPE event
2020-08-05 09:59:49 +02:00
bench
perf bench mem: Always memset source before memcpy
2020-08-21 13:05:38 +02:00
Documentation
perf record/stat: Explicitly call out event modifiers in the documentation
2020-09-05 11:22:49 +02:00
examples/bpf
perf augmented_raw_syscalls: Reduce perf_event_output() boilerplate
2019-08-26 11:58:29 -03:00
include/bpf
perf include bpf: Add bpf_tail_call() prototype
2019-07-29 18:34:40 -03:00
jvmti
perf jvmti: Link against tools/lib/ctype.h to have weak strlcpy()
2019-10-15 11:47:38 -03:00
lib
libperf: Add perf_evlist__poll() function
2019-09-25 09:51:49 -03:00
pmu-events
perf vendor events arm64: Fix Ampere eMag event typo
2021-03-04 10:26:32 +01:00
python
…
scripts
perf scripts python: exported-sql-viewer.py: Fix unexpanded 'Find' result
2020-07-16 08:16:47 +02:00
tests
perf test: Fix unaligned access in sample parsing test
2021-03-04 10:26:35 +01:00
trace
perf beauty: Fix fsconfig generator
2021-05-14 09:44:30 +02:00
ui
perf report TUI: Fix segmentation fault in perf_evsel__hists_browse()
2020-07-16 08:16:38 +02:00
util
perf symbols: Fix dso__fprintf_symbols_by_name() to return the number of printed chars
2021-05-14 09:44:26 +02:00
.gitignore
perf: Update .gitignore file
2019-08-31 22:27:52 -03:00
Build
…
builtin-annotate.c
perf session: Return error code for perf_session__new() function on failure
2019-09-20 15:58:11 -03:00
builtin-bench.c
perf tools: Remove perf.h from source files not needing it
2019-08-29 17:38:32 -03:00
builtin-buildid-cache.c
perf session: Return error code for perf_session__new() function on failure
2019-09-20 15:58:11 -03:00
builtin-buildid-list.c
perf session: Return error code for perf_session__new() function on failure
2019-09-20 15:58:11 -03:00
builtin-c2c.c
perf c2c: Fix return type for histogram sorting comparision functions
2020-02-05 21:22:40 +00:00
builtin-config.c
perf tools: Remove util.h from where it is not needed
2019-09-20 09:19:20 -03:00
builtin-data.c
perf debug: Remove needless include directives from debug.h
2019-08-31 19:10:19 -03:00
builtin-diff.c
perf diff: Use llabs() with 64-bit values
2020-01-04 19:18:26 +01:00
builtin-evlist.c
perf evsel: Introduce evsel_fprintf.h
2019-09-25 16:26:34 -03:00
builtin-ftrace.c
perf ftrace: Fix access to pid in array when setting a pid filter
2021-05-07 10:51:37 +02:00
builtin-help.c
perf debug: Remove needless include directives from debug.h
2019-08-31 19:10:19 -03:00
builtin-inject.c
perf inject: Fix repipe usage
2021-04-14 08:24:17 +02:00
builtin-kallsyms.c
perf dsos: Move the dsos struct and its methods to separate source files
2019-08-31 22:24:10 -03:00
builtin-kmem.c
perf kmem: Fix memory leak in compact_gfp_flags()
2019-10-16 10:08:32 -03:00
builtin-kvm.c
perf tools: Propagate get_cpuid() error
2019-09-30 17:29:54 -03:00
builtin-list.c
perf list: Allow plurals for metric, metricgroup
2019-09-25 09:51:42 -03:00
builtin-lock.c
perf lock: Don't free "lock_seq_stat" if read_count isn't zero
2020-11-24 13:29:05 +01:00
builtin-mem.c
perf session: Return error code for perf_session__new() function on failure
2019-09-20 15:58:11 -03:00
builtin-probe.c
perf probe: Do not show the skipped events
2020-06-22 09:31:27 +02:00
builtin-record.c
perf record: Correct the help info of option "--no-bpf-event"
2020-09-09 19:12:36 +02:00
builtin-report.c
perf report: Fix NULL pointer dereference in hists__fprintf_nr_sample_events()
2020-06-24 17:50:45 +02:00
builtin-sched.c
perf evsel: Introduce evsel_fprintf.h
2019-09-25 16:26:34 -03:00
builtin-script.c
perf script: Fix --reltime with --time
2020-01-23 08:23:01 +01:00
builtin-stat.c
perf stat: Skip duration_time in setup_system_wide
2020-10-29 09:57:50 +01:00
builtin-timechart.c
perf session: Return error code for perf_session__new() function on failure
2019-09-20 15:58:11 -03:00
builtin-top.c
perf top: Fix stdio interface input handling with glibc 2.28+
2020-10-14 10:32:59 +02:00
builtin-trace.c
perf trace: Fix segfault when trying to trace events by cgroup
2020-11-18 19:20:18 +01:00
builtin-version.c
perf symbols: Move mem_info and branch_info out of symbol.h
2019-08-31 22:27:48 -03:00
builtin.h
perf tools: Remove needless util.h include from builtin.h
2019-08-28 17:19:34 -03:00
check-headers.sh
tools headers uapi: Sync linux/fs.h with the kernel sources
2019-09-30 17:29:22 -03:00
command-list.txt
…
CREDITS
…
design.txt
…
Makefile
tools: Let O= makes handle a relative path with -C option
2020-04-01 11:02:00 +02:00
Makefile.config
perf tools: Support Python 3.8+ in Makefile
2020-04-17 10:50:21 +02:00
Makefile.perf
tools: Factor HOSTCC, HOSTLD, HOSTAR definitions
2021-01-30 13:54:10 +01:00
MANIFEST
tools lib: Adopt zalloc()/zfree() from tools/perf
2019-07-09 10:13:26 -03:00
perf-archive.sh
…
perf-completion.sh
…
perf-read-vdso.c
…
perf-sys.h
perf tools: Make usage of test_attr__* optional for perf-sys.h
2019-10-31 21:38:41 +01:00
perf-with-kcore.sh
Merge branch 'x86/cpu' into perf/core, to pick up dependent changes
2019-06-17 12:29:16 +02:00
perf.c
libperf: Merge libperf_set_print() into libperf_init()
2019-09-25 09:51:49 -03:00
perf.h
perf time-utils: Adopt rdclock() from perf.h
2019-08-29 17:38:32 -03:00