android_kernel_motorola_sm6375/tools/perf
Repository files (latest commit first)
Filename Latest commit message Latest commit date
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: d35293004a ("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
include/bpf
jvmti
lib
pmu-events perf vendor events arm64: Fix Ampere eMag event typo 2021-03-04 10:26:32 +01:00
python
scripts
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
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
Build
builtin-annotate.c
builtin-bench.c
builtin-buildid-cache.c
builtin-buildid-list.c
builtin-c2c.c
builtin-config.c
builtin-data.c
builtin-diff.c
builtin-evlist.c
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
builtin-inject.c perf inject: Fix repipe usage 2021-04-14 08:24:17 +02:00
builtin-kallsyms.c
builtin-kmem.c
builtin-kvm.c
builtin-list.c
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
builtin-probe.c
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
builtin-sched.c
builtin-script.c
builtin-stat.c perf stat: Skip duration_time in setup_system_wide 2020-10-29 09:57:50 +01:00
builtin-timechart.c
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
builtin.h
check-headers.sh
command-list.txt
CREDITS
design.txt
Makefile
Makefile.config
Makefile.perf tools: Factor HOSTCC, HOSTLD, HOSTAR definitions 2021-01-30 13:54:10 +01:00
MANIFEST
perf-archive.sh
perf-completion.sh
perf-read-vdso.c
perf-sys.h
perf-with-kcore.sh
perf.c
perf.h