Merge branch 'bpftool-JSON'

Browse source

Jakub Kicinski says:

====================
tools: bpftool: Add JSON output to bpftool

Quentin says:

This series introduces support for JSON output to all bpftool commands. It
adds option parsing, and several options are created:

  * -j, --json     Switch to JSON output.
  * -p, --pretty   Switch to JSON and print it in a human-friendly fashion.
  * -h, --help     Print generic help message.
  * -V, --version  Print version number.

This code uses a "json_writer", which is a copy of the one written by
Stephen Hemminger in iproute2.
---
I don't know if there is an easy way to share the code for json_write
without copying the file, so I am very open to suggestions on this matter.
====================

Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2017-10-24 01:25:10 +01:00

parent 4c4fde210c 0641c3c890

commit a5dd498287

11 changed files with 1209 additions and 184 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

44

tools/bpf/bpftool/Documentation/bpftool-map.rst

View file

81

tools/bpf/bpftool/Documentation/bpftool-prog.rst

View file

32

tools/bpf/bpftool/Documentation/bpftool.rst

View file

36

tools/bpf/bpftool/common.c

View file

86

tools/bpf/bpftool/jit_disasm.c

View file

356

tools/bpf/bpftool/json_writer.c

View file

72

tools/bpf/bpftool/json_writer.h

View file

121

tools/bpf/bpftool/main.c

View file

43

tools/bpf/bpftool/main.h

View file

253

tools/bpf/bpftool/map.c

View file

279

tools/bpf/bpftool/prog.c

View file