systrace: update to trace-viewer rev 740
Change-Id: I56fd37959b15653100a6add274c066c4359d55f0
diff --git a/systrace.py b/systrace.py
index baafc6f..ef1776b 100755
--- a/systrace.py
+++ b/systrace.py
@@ -52,7 +52,7 @@
return version
def add_adb_serial(command, serial):
- if serial != None:
+ if serial is not None:
command.insert(1, serial)
command.insert(1, '-s')
@@ -130,16 +130,18 @@
src_dir = os.path.join(script_dir, options.asset_dir, 'src')
build_dir = os.path.join(script_dir, options.asset_dir, 'build')
- js_files, js_flattenizer, css_files = get_assets(src_dir, build_dir)
+ js_files, js_flattenizer, css_files, templates = get_assets(src_dir, build_dir)
css = '\n'.join(linked_css_tag % (os.path.join(src_dir, f)) for f in css_files)
js = '<script language="javascript">\n%s</script>\n' % js_flattenizer
js += '\n'.join(linked_js_tag % (os.path.join(src_dir, f)) for f in js_files)
+
else:
css_filename = os.path.join(script_dir, flattened_css_file)
js_filename = os.path.join(script_dir, flattened_js_file)
css = compiled_css_tag % (open(css_filename).read())
js = compiled_js_tag % (open(js_filename).read())
+ templates = ''
html_filename = options.output_file
@@ -218,7 +220,7 @@
print " done\n"
html_file = open(html_filename, 'w')
- html_file.write(html_prefix % (css, js))
+ html_file.write(html_prefix % (css, js, templates))
size = 4096
dec = zlib.decompressobj()
@@ -231,7 +233,7 @@
html_file.write(html_out)
html_file.write(html_suffix)
html_file.close()
- print "\n wrote file://%s/%s\n" % (os.getcwd(), options.output_file)
+ print "\n wrote file://%s\n" % os.path.abspath(options.output_file)
else: # i.e. result != 0
print >> sys.stderr, 'adb returned error code %d' % result
@@ -241,22 +243,31 @@
sys.path.append(build_dir)
gen = __import__('generate_standalone_timeline_view', {}, {})
parse_deps = __import__('parse_deps', {}, {})
+ gen_templates = __import__('generate_template_contents', {}, {})
filenames = gen._get_input_filenames()
load_sequence = parse_deps.calc_load_sequence(filenames, src_dir)
js_files = []
js_flattenizer = "window.FLATTENED = {};\n"
+ js_flattenizer += "window.FLATTENED_RAW_SCRIPTS = {};\n"
css_files = []
for module in load_sequence:
js_files.append(os.path.relpath(module.filename, src_dir))
js_flattenizer += "window.FLATTENED['%s'] = true;\n" % module.name
+ for dependent_raw_script_name in module.dependent_raw_script_names:
+ js_flattenizer += (
+ "window.FLATTENED_RAW_SCRIPTS['%s'] = true;\n" %
+ dependent_raw_script_name)
+
for style_sheet in module.style_sheets:
css_files.append(os.path.relpath(style_sheet.filename, src_dir))
+ templates = gen_templates.generate_templates()
+
sys.path.pop()
- return (js_files, js_flattenizer, css_files)
+ return (js_files, js_flattenizer, css_files, templates)
html_prefix = """<!DOCTYPE HTML>
<html>
@@ -270,9 +281,9 @@
if (!linuxPerfData)
return;
- var m = new tracing.Model(linuxPerfData);
+ var m = new tracing.TraceModel(linuxPerfData);
var timelineViewEl = document.querySelector('.view');
- tracing.ui.decorate(timelineViewEl, tracing.TimelineView);
+ ui.decorate(timelineViewEl, tracing.TimelineView);
timelineViewEl.model = m;
timelineViewEl.tabIndex = 1;
timelineViewEl.timeline.focusElement = timelineViewEl;
@@ -290,6 +301,7 @@
</style>
</head>
<body>
+ <div>%s</div>
<div class="view">
</div>
<!-- BEGIN TRACE -->