[Android] Log the size of data transerred to device.

[Android] Log the size of data transerred to device.

BUG=252047
NOTRY=True

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=207641

[craigdh, 2013-06-20 17:46:51]

lgtm w/ comment.

https://codereview.chromium.org/17463008/diff/1/build/android/pylib/android_c...
File build/android/pylib/android_commands.py (right):

https://codereview.chromium.org/17463008/diff/1/build/android/pylib/android_c...
build/android/pylib/android_commands.py:749: size =
int(cmd_helper.GetCmdOutput(['du', '-sm', local_path]).split()[0])
why megabytes? just keep track of the bytes and print out MB with some
significant digits, this could get confusing if small files are pushed and I
don't see any advantage.

[frankf, 2013-06-20 18:32:30]

https://codereview.chromium.org/17463008/diff/1/build/android/pylib/android_c...
File build/android/pylib/android_commands.py (right):

https://codereview.chromium.org/17463008/diff/1/build/android/pylib/android_c...
build/android/pylib/android_commands.py:749: size =
int(cmd_helper.GetCmdOutput(['du', '-sm', local_path]).split()[0])
On 2013/06/20 17:46:51, craigdh wrote:
> why megabytes? just keep track of the bytes and print out MB with some
> significant digits, this could get confusing if small files are pushed and I
> don't see any advantage.

Done.

[commit-bot: I haz the power, 2013-06-20 18:34:16]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/frankf@chromium.org/17463008/8001

[commit-bot: I haz the power, 2013-06-20 18:34:17]

Failed to apply patch for build/android/pylib/android_commands.py:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file build/android/pylib/android_commands.py
  Hunk #1 FAILED at 219.
  1 out of 5 hunks FAILED -- saving rejects to file
build/android/pylib/android_commands.py.rej

Patch:       build/android/pylib/android_commands.py
Index: build/android/pylib/android_commands.py
diff --git a/build/android/pylib/android_commands.py
b/build/android/pylib/android_commands.py
index
f260639352cb073fa6674acbf979f0a307361f44..4fcb6c71540224fbeffffb8445b2edb1ba3164ff
100644
--- a/build/android/pylib/android_commands.py
+++ b/build/android/pylib/android_commands.py
@@ -219,6 +219,8 @@ class AndroidCommands(object):
     self.logcat_process = None
     self._logcat_tmpoutfile = None
     self._pushed_files = []
+    self._potential_push_size = 0
+    self._actual_push_size = 0
     self._device_utc_offset = self.RunShellCommand('date +%z')[0]
     self._md5sum_build_dir = ''
     self._external_storage = ''
@@ -708,8 +710,6 @@ class AndroidCommands(object):
     Returns:
       True if the md5sums match.
     """
-    assert os.path.exists(local_path), 'Local path not found %s' % local_path
-
     if not self._md5sum_build_dir:
       default_build_type = os.environ.get('BUILD_TYPE', 'Debug')
       build_dir = '%s/%s/' % (
@@ -723,7 +723,6 @@ class AndroidCommands(object):
       assert _HasAdbPushSucceeded(self._adb.SendCommand(command))
       self._md5sum_build_dir = build_dir
 
-    self._pushed_files.append(device_path)
     hashes_on_device = _ComputeFileListHash(
         self.RunShellCommand(MD5SUM_LD_LIBRARY_PATH + ' ' + self._util_wrapper
+
             ' ' + MD5SUM_DEVICE_PATH + ' ' + device_path))
@@ -746,9 +745,15 @@ class AndroidCommands(object):
 
     All pushed files can be removed by calling RemovePushedFiles().
     """
+    assert os.path.exists(local_path), 'Local path not found %s' % local_path
+    size = int(cmd_helper.GetCmdOutput(['du', '-sb', local_path]).split()[0])
+    self._pushed_files.append(device_path)
+    self._potential_push_size += size
+
     if self.CheckMd5Sum(local_path, device_path):
       return
 
+    self._actual_push_size += size
     # They don't match, so remove everything first and then create it.
     if os.path.isdir(local_path):
       self.RunShellCommand('rm -r %s' % device_path, timeout_time=2 * 60)
@@ -761,6 +766,15 @@ class AndroidCommands(object):
     output = self._adb.SendCommand(push_command, timeout_time=30 * 60)
     assert _HasAdbPushSucceeded(output)
 
+  def GetPushSizeInfo(self):
+    """Get total size of pushes to the device done via PushIfNeeded()
+
+    Returns:
+      A tuple:
+        1. Total size of push requests to PushIfNeeded (MB)
+        2. Total size that was actually pushed (MB)
+    """
+    return (self._potential_push_size, self._actual_push_size)
 
   def GetFileContents(self, filename, log_result=False):
     """Gets contents from the file specified by |filename|."""

[commit-bot: I haz the power, 2013-06-20 23:11:57]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/frankf@chromium.org/17463008/17001

[commit-bot: I haz the power, 2013-06-20 23:47:29]

Change committed as 207641