tools perf beauty: Fix usbdevfs_ioctl table generator to handle _IOC()

tip:perf/urgent tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Jul 29, 2019 perf events

Share & tools

tip-bot for Arnaldo Carvalho de Melo

author merge bot

2019-07-29 21:31 UTC #0 lore raw

Commit-ID:  7ee526152db7a75d7b8713346dac76ffc3662b29
Gitweb:     https://git.kernel.org/tip/7ee526152db7a75d7b8713346dac76ffc3662b29
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Fri, 26 Jul 2019 15:29:56 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Mon, 29 Jul 2019 09:03:42 -0300

tools perf beauty: Fix usbdevfs_ioctl table generator to handle _IOC()

In addition to _IOW() and _IOR(), to handle this case:

  #define USBDEVFS_CONNINFO_EX(len)  _IOC(_IOC_READ, 'U', 32, len)

That will happen in the next sync of this header file.

Cc Adrian Hunter <[email protected]>

Cc Jiri Olsa <[email protected]>

Cc Luis Cláudio Gonçalves <[email protected]>

Cc Namhyung Kim <[email protected]>

Link https://lkml.kernel.org/n/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/perf/trace/beauty/usbdevfs_ioctl.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

tools/perf/trace/beauty/usbdevfs_ioctl.sh +6 -3

index 930b80f422e8..aa597ae53747 100755
@@ -3,10 +3,13 @@
 
 [ $# -eq 1 ] && header_dir=$1 || header_dir=tools/include/uapi/linux/
 
+# also as:
+# #define USBDEVFS_CONNINFO_EX(len)  _IOC(_IOC_READ, 'U', 32, len)
+
 printf "static const char *usbdevfs_ioctl_cmds[] = {\n"
-regex="^#[[:space:]]*define[[:space:]]+USBDEVFS_(\w+)[[:space:]]+_IO[WR]{0,2}\([[:space:]]*'U'[[:space:]]*,[[:space:]]*([[:digit:]]+).*"
-egrep $regex ${header_dir}/usbdevice_fs.h | egrep -v 'USBDEVFS_\w+32[[:space:]]' | \
-	sed -r "s/$regex/\2 \1/g"	| \
+regex="^#[[:space:]]*define[[:space:]]+USBDEVFS_(\w+)(\(\w+\))?[[:space:]]+_IO[CWR]{0,2}\([[:space:]]*(_IOC_\w+,[[:space:]]*)?'U'[[:space:]]*,[[:space:]]*([[:digit:]]+).*"
+egrep "$regex" ${header_dir}/usbdevice_fs.h | egrep -v 'USBDEVFS_\w+32[[:space:]]' | \
+	sed -r "s/$regex/\4 \1/g"	| \
 	sort | xargs printf "\t[%s] = \"%s\",\n"
 printf "};\n\n"
 printf "#if 0\n"