adb_profile_chrome: Use Enter to stop early instead of Ctrl-C

build/android/adb_profile_chrome.py

 #!/usr/bin/env python
 #
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import base64
 import gzip
 import logging
 import optparse
 import os
 import re
+import select
 import shutil
 import sys
 import threading
 import time
 import webbrowser
 import zipfile
 import zlib
 
 from pylib import android_commands
 from pylib import cmd_helper
@@ skipping 233 matching lines @@
     for host_file in host_files:
       z.write(host_file)
       os.unlink(host_file)
 
 
 def _PrintMessage(heading, eol='\n'):
   sys.stdout.write('%s%s' % (heading, eol))
   sys.stdout.flush()
 
 
+def _WaitForEnter(timeout):
+  select.select([sys.stdin], [], [], timeout)
+
+
 def _StartTracing(controllers, interval):
   for controller in controllers:
     controller.StartTracing(interval)
 
 
 def _StopTracing(controllers):
   for controller in controllers:
     controller.StopTracing()
 
 
@@ skipping 24 matching lines @@
   _PrintMessage('done')
   _PrintMessage('Trace written to %s' % os.path.abspath(result))
   return result
 
 
 def _CaptureAndPullTrace(controllers, interval, output, compress, write_html):
   trace_type = ' + '.join(map(str, controllers))
   try:
     _StartTracing(controllers, interval)
     if interval:
-      _PrintMessage('Capturing %d-second %s. Press Ctrl-C to stop early...' % \
+      _PrintMessage('Capturing %d-second %s. Press Enter to stop early...' % \
           (interval, trace_type), eol='')
-      time.sleep(interval)
+      _WaitForEnter(interval)
     else:
       _PrintMessage('Capturing %s. Press Enter to stop...' % trace_type, eol='')
       raw_input()
-  except KeyboardInterrupt:
-    _PrintMessage('\nInterrupted...', eol='')
   finally:
     _StopTracing(controllers)
   if interval:
     _PrintMessage('done')
 
   return _PullTraces(controllers, output, compress, write_html)
 
 
 def _ComputeChromeCategories(options):
   categories = []
@@ skipping 113 matching lines @@
                                 options.time if not options.continuous else 0,
                                 options.output,
                                 options.compress,
                                 options.html)
   if options.view:
     webbrowser.open(result)
 
 
 if __name__ == '__main__':
   sys.exit(main())