linux-kernel - [PATCH] perf script flamegraph: python2 support, update cli args

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20200409165734.165260-1-agerstmayr@redhat.com>
Date:   Thu,  9 Apr 2020 18:57:31 +0200
From:   Andreas Gerstmayr <agerstmayr@...hat.com>
To:     linux-perf-users@...r.kernel.org
Cc:     Andreas Gerstmayr <agerstmayr@...hat.com>,
        Peter Zijlstra <peterz@...radead.org>,
        Ingo Molnar <mingo@...hat.com>,
        Arnaldo Carvalho de Melo <acme@...nel.org>,
        Mark Rutland <mark.rutland@....com>,
        Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
        Jiri Olsa <jolsa@...hat.com>,
        Namhyung Kim <namhyung@...nel.org>,
        linux-kernel@...r.kernel.org
Subject: [PATCH] perf script flamegraph: python2 support, update cli args

* removed --indent argument
* renamed -F to -f argument to be consistent with other arguments

Signed-off-by: Andreas Gerstmayr <agerstmayr@...hat.com>
---
 tools/perf/scripts/python/flamegraph.py | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/tools/perf/scripts/python/flamegraph.py b/tools/perf/scripts/python/flamegraph.py
index 5835d190ca42..61f3be9add6b 100755
--- a/tools/perf/scripts/python/flamegraph.py
+++ b/tools/perf/scripts/python/flamegraph.py
@@ -14,6 +14,7 @@
 # Flame Graphs invented by Brendan Gregg <bgregg@...flix.com>
 # Works in tandem with d3-flame-graph by Martin Spier <mspier@...flix.com>
 
+from __future__ import print_function
 import sys
 import os
 import argparse
@@ -43,11 +44,11 @@ class FlameGraphCLI:
 
         if self.args.format == "html" and \
                 not os.path.isfile(self.args.template):
-            print(f"Flame Graph template {self.args.template} does not " +
-                  f"exist. Please install the js-d3-flame-graph (RPM) or " +
-                  f"libjs-d3-flame-graph (deb) package, specify an " +
-                  f"existing flame graph template (--template PATH) or " +
-                  f"another output format (--format FORMAT).",
+            print("Flame Graph template {} does not exist. Please install "
+                  "the js-d3-flame-graph (RPM) or libjs-d3-flame-graph (deb) "
+                  "package, specify an existing flame graph template "
+                  "(--template PATH) or another output format "
+                  "(--format FORMAT).".format(self.args.template),
                   file=sys.stderr)
             sys.exit(1)
 
@@ -76,8 +77,7 @@ class FlameGraphCLI:
         node.value += 1
 
     def trace_end(self):
-        json_str = json.dumps(self.stack, default=lambda x: x.toJSON(),
-                              indent=self.args.indent)
+        json_str = json.dumps(self.stack, default=lambda x: x.toJSON())
 
         if self.args.format == "html":
             try:
@@ -85,7 +85,7 @@ class FlameGraphCLI:
                     output_str = f.read().replace("/** @flamegraph_json **/",
                                                   json_str)
             except IOError as e:
-                print(f"Error reading template file: {e}", file=sys.stderr)
+                print("Error reading template file: {}".format(e), file=sys.stderr)
                 sys.exit(1)
             output_fn = self.args.output or "flamegraph.html"
         else:
@@ -95,24 +95,22 @@ class FlameGraphCLI:
         if output_fn == "-":
             sys.stdout.write(output_str)
         else:
-            print(f"dumping data to {output_fn}")
+            print("dumping data to {}".format(output_fn))
             try:
                 with open(output_fn, "w") as out:
                     out.write(output_str)
             except IOError as e:
-                print(f"Error writing output file: {e}", file=sys.stderr)
+                print("Error writing output file: {}".format(e), file=sys.stderr)
                 sys.exit(1)
 
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description="Create flame graphs.")
-    parser.add_argument("-F", "--format",
+    parser.add_argument("-f", "--format",
                         default="html", choices=["json", "html"],
                         help="output file format")
     parser.add_argument("-o", "--output",
                         help="output file name")
-    parser.add_argument("--indent",
-                        type=int, help="JSON indentation")
     parser.add_argument("--template",
                         default="/usr/share/d3-flame-graph/d3-flamegraph-base.html",
                         help="path to flamegraph HTML template")
-- 
2.25.2