diff options
| author | Siva Velusamy <vsiva@google.com> | 2013-07-22 13:58:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-22 13:58:18 -0700 |
| commit | ad0c59f8bd5480d901fa2e881b89bf86141ea73b (patch) | |
| tree | 875620271aeaa15123edf19aada11ef02ff3d760 | |
| parent | 0deb7845678f5ed05abf8238121f12bae32848b9 (diff) | |
| parent | 874f33ce32d311ec80c149afd11d9ae17fee68f8 (diff) | |
| download | chromium-trace-ad0c59f8bd5480d901fa2e881b89bf86141ea73b.tar.gz | |
am 874f33ce: Extract prefix and suffix html blocks to separate files DO NOT MERGE
* commit '874f33ce32d311ec80c149afd11d9ae17fee68f8':
Extract prefix and suffix html blocks to separate files DO NOT MERGE
| -rw-r--r-- | prefix.html | 37 | ||||
| -rw-r--r-- | suffix.html | 5 | ||||
| -rwxr-xr-x | systrace-legacy.py | 50 | ||||
| -rwxr-xr-x | systrace.py | 52 |
4 files changed, 53 insertions, 91 deletions
diff --git a/prefix.html b/prefix.html new file mode 100644 index 00000000..e8ceca1e --- /dev/null +++ b/prefix.html @@ -0,0 +1,37 @@ +<!DOCTYPE HTML> +<html> +<head i18n-values="dir:textdirection;"> +<meta charset="utf-8"/> +<title>Android System Trace</title> +%s +%s +<script language="javascript"> +document.addEventListener('DOMContentLoaded', function() { + if (!linuxPerfData) + return; + + var m = new tracing.Model(linuxPerfData); + var timelineViewEl = document.querySelector('.view'); + tracing.ui.decorate(timelineViewEl, tracing.TimelineView); + timelineViewEl.model = m; + timelineViewEl.tabIndex = 1; + timelineViewEl.timeline.focusElement = timelineViewEl; +}); +</script> +<style> + .view { + overflow: hidden; + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + } +</style> +</head> +<body> + <div class="view"> + </div> +<!-- BEGIN TRACE --> + <script> + var linuxPerfData = "\ diff --git a/suffix.html b/suffix.html new file mode 100644 index 00000000..f770848b --- /dev/null +++ b/suffix.html @@ -0,0 +1,5 @@ +\n"; + </script> +<!-- END TRACE --> +</body> +</html> diff --git a/systrace-legacy.py b/systrace-legacy.py index 98eeb877..b969aacc 100755 --- a/systrace-legacy.py +++ b/systrace-legacy.py @@ -174,6 +174,7 @@ def main(): sys.stdout.write("downloading trace...") sys.stdout.flush() out = ''.join(lines[i+1:]) + html_prefix = read_asset(script_dir, 'prefix.html') html_file = open(html_filename, 'w') html_file.write(html_prefix % (css, js)) trace_started = True @@ -197,6 +198,7 @@ def main(): html_out = dec.flush().replace('\n', '\\n\\\n').replace('\r', '') if len(html_out) > 0: html_file.write(html_out) + html_suffix = read_asset(script_dir, 'suffix.html') html_file.write(html_suffix) html_file.close() print " done\n\n wrote file://%s/%s\n" % (os.getcwd(), options.output_file) @@ -204,6 +206,9 @@ def main(): print >> sys.stderr, ('An error occured while capturing the trace. Output ' + 'file was not written.') +def read_asset(src_dir, filename): + return open(os.path.join(src_dir, filename)).read() + def get_assets(src_dir, build_dir): sys.path.append(build_dir) gen = __import__('generate_standalone_timeline_view', {}, {}) @@ -225,51 +230,6 @@ def get_assets(src_dir, build_dir): return (js_files, js_flattenizer, css_files) -html_prefix = """<!DOCTYPE HTML> -<html> -<head i18n-values="dir:textdirection;"> -<title>Android System Trace</title> -%s -%s -<script language="javascript"> -document.addEventListener('DOMContentLoaded', function() { - if (!linuxPerfData) - return; - - var m = new tracing.Model(linuxPerfData); - var timelineViewEl = document.querySelector('.view'); - tracing.ui.decorate(timelineViewEl, tracing.TimelineView); - timelineViewEl.model = m; - timelineViewEl.tabIndex = 1; - timelineViewEl.timeline.focusElement = timelineViewEl; -}); -</script> -<style> - .view { - overflow: hidden; - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - } -</style> -</head> -<body> - <div class="view"> - </div> -<!-- BEGIN TRACE --> - <script> - var linuxPerfData = "\\ -""" - -html_suffix = """\\n"; - </script> -<!-- END TRACE --> -</body> -</html> -""" - compiled_css_tag = """<style type="text/css">%s</style>""" compiled_js_tag = """<script language="javascript">%s</script>""" diff --git a/systrace.py b/systrace.py index baafc6f1..492f53a3 100755 --- a/systrace.py +++ b/systrace.py @@ -217,6 +217,9 @@ def main(): # Indicate to the user that the data download is complete. print " done\n" + html_prefix = read_asset(script_dir, 'prefix.html') + html_suffix = read_asset(script_dir, 'suffix.html') + html_file = open(html_filename, 'w') html_file.write(html_prefix % (css, js)) @@ -237,6 +240,9 @@ def main(): print >> sys.stderr, 'adb returned error code %d' % result sys.exit(1) +def read_asset(src_dir, filename): + return open(os.path.join(src_dir, filename)).read() + def get_assets(src_dir, build_dir): sys.path.append(build_dir) gen = __import__('generate_standalone_timeline_view', {}, {}) @@ -258,52 +264,6 @@ def get_assets(src_dir, build_dir): return (js_files, js_flattenizer, css_files) -html_prefix = """<!DOCTYPE HTML> -<html> -<head i18n-values="dir:textdirection;"> -<meta charset="utf-8"/> -<title>Android System Trace</title> -%s -%s -<script language="javascript"> -document.addEventListener('DOMContentLoaded', function() { - if (!linuxPerfData) - return; - - var m = new tracing.Model(linuxPerfData); - var timelineViewEl = document.querySelector('.view'); - tracing.ui.decorate(timelineViewEl, tracing.TimelineView); - timelineViewEl.model = m; - timelineViewEl.tabIndex = 1; - timelineViewEl.timeline.focusElement = timelineViewEl; -}); -</script> -<style> - .view { - overflow: hidden; - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - } -</style> -</head> -<body> - <div class="view"> - </div> -<!-- BEGIN TRACE --> - <script> - var linuxPerfData = "\\ -""" - -html_suffix = """\\n"; - </script> -<!-- END TRACE --> -</body> -</html> -""" - compiled_css_tag = """<style type="text/css">%s</style>""" compiled_js_tag = """<script language="javascript">%s</script>""" |