Which we can use in the comman-line tools, which is quite handy.
Change-Id: I904d5895d9422b3bc6a54fdbfbd4e51b06996f95
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@intel.com>
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,
- BmapHelpers.human_size(flasher.bmap_total_size),
- flasher.bmap_mapped_cnt,
- BmapHelpers.human_size(flasher.bmap_mapped_size),
+ flasher.bmap_total_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'" \
% (args.bdev, args.bmap))
from fcntl import ioctl
import struct
from itertools import groupby
-from bmaptools import BmapHelpers
+from BmapHelpers import human_size
import array
# The bmap format version we generate
self.fiemap_supported = None
self.bmap_image_size = None
+ self.bmap_image_size_human = None
self.bmap_block_size = None
self.bmap_blocks_cnt = None
self.bmap_mapped_cnt = None
self.bmap_mapped_size = None
+ self.bmap_mapped_size_human = None
self.bmap_mapped_percent = None
self._f_image = None
% (image_path, err), err.errno)
self.bmap_image_size = os.fstat(self._f_image.fileno()).st_size
+ self.bmap_image_size_human = human_size(self.bmap_image_size)
if self.bmap_image_size == 0:
raise Error("cannot generate bmap for zero-sized image file '%s'" \
% image_path, err.errno)
xml += "<bmap version=\"%s\">\n" % bmap_version
xml += "\t<!-- Image size in bytes (%s) -->\n" \
- % BmapHelpers.human_size(self.bmap_image_size)
+ % self.bmap_image_size_human
xml += "\t<ImageSize> %u </ImageSize>\n\n" % self.bmap_image_size
xml += "\t<!-- Size of a block in bytes -->\n"
mapped blocks. """
xml = "\t</BlockMap>\n\n"
- human_size = BmapHelpers.human_size(self.bmap_mapped_size)
xml += "\t<!-- Count of mapped blocks (%s or %.1f%% mapped) -->\n" \
- % (human_size, self.bmap_mapped_percent)
+ % (self.bmap_mapped_size_human, self.bmap_mapped_percent)
xml += "\t<MappedBlocksCount> %u </MappedBlocksCount>\n" \
% self.bmap_mapped_cnt
xml += "</bmap>"
% (sha1, first, last))
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
self.bmap_mapped_percent /= self.bmap_blocks_cnt
self._bmap_file_end()
import os
import hashlib
from xml.etree import ElementTree
+from BmapHelpers import human_size
# A list of supported image formats
supported_image_formats = ('bz2', 'gz', 'tar.gz', 'tgz', 'tar.bz2')
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_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
self.bmap_mapped_percent /= self.bmap_blocks_cnt
self.bmap_blocks_cnt = None
self.bmap_mapped_cnt = None
self.bmap_total_size = None
+ self.bmap_total_size_human = None
self.bmap_mapped_size = None
+ self.bmap_mapped_size_human = None
self.bmap_mapped_percent = None
self._open_block_device()
# 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_mapped_cnt = self.bmap_blocks_cnt
self.bmap_mapped_size = self.bmap_total_size
+ self.bmap_mapped_size_human = self.bmap_total_size_human
if sync:
self.sync()