Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Unified Diff: tools/android/loading/loading_trace_analyzer.py

Issue 1738803003: tools/android/loading: Implements loading_trace_analyzer.py's unittest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@i11
Patch Set: Addresses pasko's nit in the ListRequests's doc string Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/android/loading/loading_trace_analyzer_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/android/loading/loading_trace_analyzer.py
diff --git a/tools/android/loading/loading_trace_analyzer.py b/tools/android/loading/loading_trace_analyzer.py
index e70336030005c83b7f2b7b9633bcdae12ac797e5..1821001d3059e48b43aad3ff3c094d5b2e7c9d0f 100755
--- a/tools/android/loading/loading_trace_analyzer.py
+++ b/tools/android/loading/loading_trace_analyzer.py
@@ -21,10 +21,10 @@ def _ArgumentParser():
# requests listing subcommand.
requests_parser = subparsers.add_parser('requests',
help='Lists all request from the loading trace.')
- requests_parser.add_argument('loading_trace', type=file,
+ requests_parser.add_argument('loading_trace', type=str,
help='Input loading trace to see the cache usage from.')
requests_parser.add_argument('--output',
- type=argparse.FileType(),
+ type=argparse.FileType('w'),
default=sys.stdout,
help='Output destination path if different from stdout.')
requests_parser.add_argument('--output-format', type=str, default='{url}',
@@ -36,9 +36,21 @@ def _ArgumentParser():
return parser
-def _RequestsSubcommand(args):
+def ListRequests(loading_trace_path,
+ output_format='{url}',
+ where_format='{url}',
+ where_statement=None):
"""`loading_trace_analyzer.py requests` Command line tool entry point.
+ Args:
+ loading_trace_path: Path of the loading trace.
+ output_format: Output format of the generated strings.
+ where_format: String formated to be regex tested with <where_statement>
+ where_statement: Regex for selecting request event.
+
+ Yields:
+ Formated string of the selected request event.
+
Example:
Lists all request with timing:
... requests --output-format "{timing} {url}"
@@ -46,28 +58,16 @@ def _RequestsSubcommand(args):
Lists HTTP/HTTPS requests that have used the cache:
... requests --where "{protocol} {from_disk_cache}" "https?\S* True"
"""
- where_format = None
- where_statement = None
- if args.where_statement:
- where_format = args.where_statement[0]
- try:
- where_statement = re.compile(args.where_statement[1])
- except re.error as e:
- sys.stderr.write("Invalid where statement REGEX: {}\n{}\n".format(
- args.where_statement[1], str(e)))
- return 1
-
- loading_trace = LoadingTrace.FromJsonDict(json.load(args.loading_trace))
+ if where_statement:
+ where_statement = re.compile(where_statement)
+ loading_trace = LoadingTrace.FromJsonFile(loading_trace_path)
for request_event in loading_trace.request_track.GetEvents():
request_event_json = request_event.ToJsonDict()
-
if where_statement != None:
where_in = where_format.format(**request_event_json)
if not where_statement.match(where_in):
continue
-
- args.output.write(args.output_format.format(**request_event_json) + '\n')
- return 0
+ yield output_format.format(**request_event_json)
def main(command_line_args):
@@ -75,7 +75,22 @@ def main(command_line_args):
"""
args = _ArgumentParser().parse_args(command_line_args)
if args.subcommand == 'requests':
- return _RequestsSubcommand(args)
+ try:
+ where_format = None
+ where_statement = None
+ if args.where_statement:
+ where_format = args.where_statement[0]
+ where_statement = args.where_statement[1]
+ for output_line in ListRequests(loading_trace_path=args.loading_trace,
+ output_format=args.output_format,
+ where_format=where_format,
+ where_statement=where_statement):
+ args.output.write(output_line + '\n')
+ return 0
+ except re.error as e:
+ sys.stderr.write("Invalid where statement REGEX: {}\n{}\n".format(
+ where_statement[1], str(e)))
+ return 1
assert False
« no previous file with comments | « no previous file | tools/android/loading/loading_trace_analyzer_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698