From 91ea2a086cdbeeda1c1f3d803f6b9b92144db74d Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Thu, 1 Nov 2012 16:05:51 +0200 Subject: [PATCH] flasher: rename 'total_size' There is inconsistenty between the flasher and creator - we use 'total_size' in flasher to describe the image size, while we use 'image_size' in the creator for the same. Let's use the same terminology everywhere, so kill 'total_size' and use 'image_size' everywhere. Change-Id: I6bb826a8cdf36b9c89aea97c54d9ff6cb2431f46 Signed-off-by: Artem Bityutskiy --- bmap-flasher | 4 ++-- bmaptools/BmapFlasher.py | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/bmap-flasher b/bmap-flasher index 640402a..fd39768 100755 --- a/bmap-flasher +++ b/bmap-flasher @@ -127,7 +127,7 @@ def main(): log.info("block map format version %s" % flasher.bmap_version) log.info("%d blocks of size %d (%s), mapped %d blocks (%s or %.1f%%)" \ % (flasher.bmap_blocks_cnt, flasher.bmap_block_size, - flasher.bmap_total_size_human, flasher.bmap_mapped_cnt, + flasher.bmap_image_size_human, flasher.bmap_mapped_cnt, flasher.bmap_mapped_size_human, flasher.bmap_mapped_percent)) log.info("writing the image to '%s' using bmap file '%s'" \ @@ -149,7 +149,7 @@ def main(): raise SystemExit(1) flashing_time = time.time() - start_time - flashing_speed = flasher.bmap_total_size / flashing_time + flashing_speed = flasher.bmap_image_size / flashing_time log.info("flashing time: %s, flashing speed %s/sec" \ % (BmapHelpers.human_time(flashing_time), \ BmapHelpers.human_size(flashing_speed))) diff --git a/bmaptools/BmapFlasher.py b/bmaptools/BmapFlasher.py index c441cda..8a53c39 100644 --- a/bmaptools/BmapFlasher.py +++ b/bmaptools/BmapFlasher.py @@ -101,8 +101,8 @@ class BmapFlasher: self.bmap_block_size = int(xml.find("BlockSize").text.strip()) self.bmap_blocks_cnt = int(xml.find("BlocksCount").text.strip()) self.bmap_mapped_cnt = int(xml.find("MappedBlocksCount").text.strip()) - self.bmap_total_size = self.bmap_blocks_cnt * self.bmap_block_size - self.bmap_total_size_human = human_size(self.bmap_total_size) + self.bmap_image_size = self.bmap_blocks_cnt * self.bmap_block_size + self.bmap_image_size_human = human_size(self.bmap_image_size) self.bmap_mapped_size = self.bmap_mapped_cnt * self.bmap_block_size self.bmap_mapped_size_human = human_size(self.bmap_mapped_size) self.bmap_mapped_percent = self.bmap_mapped_cnt * 100.0 @@ -181,8 +181,8 @@ class BmapFlasher: self.bmap_block_size = None self.bmap_blocks_cnt = None self.bmap_mapped_cnt = None - self.bmap_total_size = None - self.bmap_total_size_human = None + self.bmap_image_size = None + self.bmap_image_size_human = None self.bmap_mapped_size = None self.bmap_mapped_size_human = None self.bmap_mapped_percent = None @@ -277,7 +277,7 @@ class BmapFlasher: self._f_image.seek(0) self._f_bdev.seek(0) chunk_size = 1024 * 1024 - total_size = 0 + image_size = 0 while True: try: @@ -295,16 +295,16 @@ class BmapFlasher: raise Error("cannot write %d bytes to '%s': %s" \ % (len(chunk), self._bdev_path, err)) - total_size += len(chunk) + image_size += len(chunk) # Now we finally know the image size, initialize some of the # user-visible variables - self.bmap_total_size = total_size - self.bmap_total_size_human = human_size(total_size) - self.bmap_blocks_cnt = self.bmap_total_size / self.bmap_block_size + self.bmap_image_size = image_size + self.bmap_image_size_human = human_size(image_size) + self.bmap_blocks_cnt = self.bmap_image_size / self.bmap_block_size self.bmap_mapped_cnt = self.bmap_blocks_cnt - self.bmap_mapped_size = self.bmap_total_size - self.bmap_mapped_size_human = self.bmap_total_size_human + self.bmap_mapped_size = self.bmap_image_size + self.bmap_mapped_size_human = self.bmap_image_size_human if sync: self.sync() -- 2.7.4