Merge remote branch 'cros/upstream' into tempbranch3

client/profilers/perf/perf.py

 """
 perf is a tool included in the linux kernel tree that
 supports functionality similar to oprofile and more.
 
 @see: http://lwn.net/Articles/310260/
 """
 
-import time, os, subprocess, signal
+import time, os, stat, subprocess, signal
+import logging
 from autotest_lib.client.bin import profiler, os_dep, utils
 
 
 class perf(profiler.profiler):
     version = 1
 
     def initialize(self, events="cycles,instructions"):
         self.events = events
         self.perf_bin = os_dep.command('perf')
         perf_help = utils.run('%s report help' % self.perf_bin,
@@ skipping 25 matching lines @@
     def report(self, test):
         for key in self.sort_keys:
             reportfile = os.path.join(test.profdir, '%s.comm' % key)
             cmd = ("%s report -i %s --sort %s,dso" % (self.perf_bin,
                                                       self.logfile,
                                                       key))
             outfile = open(reportfile, 'w')
             p = subprocess.Popen(cmd, shell=True, stdout=outfile,
                                  stderr=subprocess.STDOUT)
             p.wait()
+        # The raw detailed perf output is HUGE.  We cannot store it by default.
+        perf_log_size = os.stat(self.logfile)[stat.ST_SIZE]
+        logging.info('Removing %s after generating reports (saving %s bytes).',
+                     self.logfile, perf_log_size)
+        os.unlink(self.logfile)