p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "FileImage: make thread-safe" am: c7b0df0295 

am: c9ab0da8d6

Change-Id: I8c755e464d423551bd67829daa28136494bf0697
This commit is contained in:
Yifan Hong 2019-04-12 20:10:27 -07:00 committed by android-build-merger
parent c14441e678 c9ab0da8d6
commit 5c53266156
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/releasetools/blockimgdiff.py
View File

@ -205,6 +205,8 @@ class FileImage(Image):
self.clobbered_blocks = RangeSet()
self.extended = RangeSet()
self.generator_lock = threading.Lock()
self.hashtree_info = None
if hashtree_info_generator:
self.hashtree_info = hashtree_info_generator.Generate(self)
@ -236,10 +238,13 @@ class FileImage(Image):
self._file.close()
def _GetRangeData(self, ranges):
for s, e in ranges:
self._file.seek(s * self.blocksize)
for _ in range(s, e):
yield self._file.read(self.blocksize)
# Use a lock to protect the generator so that we will not run two
# instances of this generator on the same object simultaneously.
with self.generator_lock:
for s, e in ranges:
self._file.seek(s * self.blocksize)
for _ in range(s, e):
yield self._file.read(self.blocksize)
def RangeSha1(self, ranges):
h = sha1()