Doug Zongker | 424296a | 2014-09-02 08:53:09 -0700 | [diff] [blame] | 1 | # Copyright (C) 2014 The Android Open Source Project |
| 2 | # |
| 3 | # Licensed under the Apache License, Version 2.0 (the "License"); |
| 4 | # you may not use this file except in compliance with the License. |
| 5 | # You may obtain a copy of the License at |
| 6 | # |
| 7 | # http://www.apache.org/licenses/LICENSE-2.0 |
| 8 | # |
| 9 | # Unless required by applicable law or agreed to in writing, software |
| 10 | # distributed under the License is distributed on an "AS IS" BASIS, |
| 11 | # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 12 | # See the License for the specific language governing permissions and |
| 13 | # limitations under the License. |
| 14 | |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 15 | from __future__ import print_function |
| 16 | |
Doug Zongker | 6ab2a50 | 2016-02-09 08:28:09 -0800 | [diff] [blame] | 17 | import array |
Tao Bao | 8dcf738 | 2015-05-21 14:09:49 -0700 | [diff] [blame] | 18 | import common |
Doug Zongker | 6ab2a50 | 2016-02-09 08:28:09 -0800 | [diff] [blame] | 19 | import functools |
Doug Zongker | 6233818 | 2014-09-08 08:29:55 -0700 | [diff] [blame] | 20 | import heapq |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 21 | import itertools |
| 22 | import multiprocessing |
| 23 | import os |
Tao Bao | 3a2e350 | 2016-12-28 09:14:39 -0800 | [diff] [blame] | 24 | import os.path |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 25 | import re |
| 26 | import subprocess |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 27 | import sys |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 28 | import threading |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 29 | |
Tao Bao | 3a2e350 | 2016-12-28 09:14:39 -0800 | [diff] [blame] | 30 | from collections import deque, OrderedDict |
| 31 | from hashlib import sha1 |
Dan Albert | 8b72aef | 2015-03-23 19:13:21 -0700 | [diff] [blame] | 32 | from rangelib import RangeSet |
| 33 | |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 34 | |
Doug Zongker | ab7ca1d | 2014-08-26 10:40:28 -0700 | [diff] [blame] | 35 | __all__ = ["EmptyImage", "DataImage", "BlockImageDiff"] |
| 36 | |
Dan Albert | 8b72aef | 2015-03-23 19:13:21 -0700 | [diff] [blame] | 37 | |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 38 | def compute_patch(srcfile, tgtfile, imgdiff=False): |
Tianjie Xu | b59c17f | 2016-10-28 17:55:53 -0700 | [diff] [blame^] | 39 | patchfile = common.MakeTempFile(prefix='patch-') |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 40 | |
Tianjie Xu | b59c17f | 2016-10-28 17:55:53 -0700 | [diff] [blame^] | 41 | cmd = ['imgdiff', '-z'] if imgdiff else ['bsdiff'] |
| 42 | cmd.extend([srcfile, tgtfile, patchfile]) |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 43 | |
Tianjie Xu | b59c17f | 2016-10-28 17:55:53 -0700 | [diff] [blame^] | 44 | # Not using common.Run(), which would otherwise dump all the bsdiff/imgdiff |
| 45 | # commands when OPTIONS.verbose is True - not useful for the case here, since |
| 46 | # they contain temp filenames only. |
| 47 | p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) |
| 48 | output, _ = p.communicate() |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 49 | |
Tianjie Xu | b59c17f | 2016-10-28 17:55:53 -0700 | [diff] [blame^] | 50 | if p.returncode != 0: |
| 51 | raise ValueError(output) |
| 52 | |
| 53 | with open(patchfile, 'rb') as f: |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 54 | return f.read() |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 55 | |
Dan Albert | 8b72aef | 2015-03-23 19:13:21 -0700 | [diff] [blame] | 56 | |
| 57 | class Image(object): |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 58 | def RangeSha1(self, ranges): |
| 59 | raise NotImplementedError |
| 60 | |
Dan Albert | 8b72aef | 2015-03-23 19:13:21 -0700 | [diff] [blame] | 61 | def ReadRangeSet(self, ranges): |
| 62 | raise NotImplementedError |
| 63 | |
Tao Bao | 68658c0 | 2015-06-01 13:40:49 -0700 | [diff] [blame] | 64 | def TotalSha1(self, include_clobbered_blocks=False): |
Dan Albert | 8b72aef | 2015-03-23 19:13:21 -0700 | [diff] [blame] | 65 | raise NotImplementedError |
| 66 | |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 67 | def WriteRangeDataToFd(self, ranges, fd): |
| 68 | raise NotImplementedError |
| 69 | |
Dan Albert | 8b72aef | 2015-03-23 19:13:21 -0700 | [diff] [blame] | 70 | |
| 71 | class EmptyImage(Image): |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 72 | """A zero-length image.""" |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 73 | |
| 74 | def __init__(self): |
| 75 | self.blocksize = 4096 |
| 76 | self.care_map = RangeSet() |
| 77 | self.clobbered_blocks = RangeSet() |
| 78 | self.extended = RangeSet() |
| 79 | self.total_blocks = 0 |
| 80 | self.file_map = {} |
| 81 | |
| 82 | def RangeSha1(self, ranges): |
| 83 | return sha1().hexdigest() |
| 84 | |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 85 | def ReadRangeSet(self, ranges): |
| 86 | return () |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 87 | |
Tao Bao | 68658c0 | 2015-06-01 13:40:49 -0700 | [diff] [blame] | 88 | def TotalSha1(self, include_clobbered_blocks=False): |
| 89 | # EmptyImage always carries empty clobbered_blocks, so |
| 90 | # include_clobbered_blocks can be ignored. |
| 91 | assert self.clobbered_blocks.size() == 0 |
Doug Zongker | ab7ca1d | 2014-08-26 10:40:28 -0700 | [diff] [blame] | 92 | return sha1().hexdigest() |
| 93 | |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 94 | def WriteRangeDataToFd(self, ranges, fd): |
| 95 | raise ValueError("Can't write data from EmptyImage to file") |
| 96 | |
Doug Zongker | ab7ca1d | 2014-08-26 10:40:28 -0700 | [diff] [blame] | 97 | |
Dan Albert | 8b72aef | 2015-03-23 19:13:21 -0700 | [diff] [blame] | 98 | class DataImage(Image): |
Doug Zongker | ab7ca1d | 2014-08-26 10:40:28 -0700 | [diff] [blame] | 99 | """An image wrapped around a single string of data.""" |
| 100 | |
| 101 | def __init__(self, data, trim=False, pad=False): |
| 102 | self.data = data |
| 103 | self.blocksize = 4096 |
| 104 | |
| 105 | assert not (trim and pad) |
| 106 | |
| 107 | partial = len(self.data) % self.blocksize |
Tao Bao | 7589e96 | 2015-09-05 20:35:32 -0700 | [diff] [blame] | 108 | padded = False |
Doug Zongker | ab7ca1d | 2014-08-26 10:40:28 -0700 | [diff] [blame] | 109 | if partial > 0: |
| 110 | if trim: |
| 111 | self.data = self.data[:-partial] |
| 112 | elif pad: |
| 113 | self.data += '\0' * (self.blocksize - partial) |
Tao Bao | 7589e96 | 2015-09-05 20:35:32 -0700 | [diff] [blame] | 114 | padded = True |
Doug Zongker | ab7ca1d | 2014-08-26 10:40:28 -0700 | [diff] [blame] | 115 | else: |
| 116 | raise ValueError(("data for DataImage must be multiple of %d bytes " |
| 117 | "unless trim or pad is specified") % |
| 118 | (self.blocksize,)) |
| 119 | |
| 120 | assert len(self.data) % self.blocksize == 0 |
| 121 | |
| 122 | self.total_blocks = len(self.data) / self.blocksize |
| 123 | self.care_map = RangeSet(data=(0, self.total_blocks)) |
Tao Bao | 7589e96 | 2015-09-05 20:35:32 -0700 | [diff] [blame] | 124 | # When the last block is padded, we always write the whole block even for |
| 125 | # incremental OTAs. Because otherwise the last block may get skipped if |
| 126 | # unchanged for an incremental, but would fail the post-install |
| 127 | # verification if it has non-zero contents in the padding bytes. |
| 128 | # Bug: 23828506 |
| 129 | if padded: |
Tao Bao | 42206c3 | 2015-09-08 13:39:40 -0700 | [diff] [blame] | 130 | clobbered_blocks = [self.total_blocks-1, self.total_blocks] |
Tao Bao | 7589e96 | 2015-09-05 20:35:32 -0700 | [diff] [blame] | 131 | else: |
Tao Bao | 42206c3 | 2015-09-08 13:39:40 -0700 | [diff] [blame] | 132 | clobbered_blocks = [] |
| 133 | self.clobbered_blocks = clobbered_blocks |
Tao Bao | e9b6191 | 2015-07-09 17:37:49 -0700 | [diff] [blame] | 134 | self.extended = RangeSet() |
Doug Zongker | ab7ca1d | 2014-08-26 10:40:28 -0700 | [diff] [blame] | 135 | |
| 136 | zero_blocks = [] |
| 137 | nonzero_blocks = [] |
| 138 | reference = '\0' * self.blocksize |
| 139 | |
Tao Bao | 7589e96 | 2015-09-05 20:35:32 -0700 | [diff] [blame] | 140 | for i in range(self.total_blocks-1 if padded else self.total_blocks): |
Doug Zongker | ab7ca1d | 2014-08-26 10:40:28 -0700 | [diff] [blame] | 141 | d = self.data[i*self.blocksize : (i+1)*self.blocksize] |
| 142 | if d == reference: |
| 143 | zero_blocks.append(i) |
| 144 | zero_blocks.append(i+1) |
| 145 | else: |
| 146 | nonzero_blocks.append(i) |
| 147 | nonzero_blocks.append(i+1) |
| 148 | |
Tao Bao | 42206c3 | 2015-09-08 13:39:40 -0700 | [diff] [blame] | 149 | assert zero_blocks or nonzero_blocks or clobbered_blocks |
Doug Zongker | ab7ca1d | 2014-08-26 10:40:28 -0700 | [diff] [blame] | 150 | |
Tao Bao | 42206c3 | 2015-09-08 13:39:40 -0700 | [diff] [blame] | 151 | self.file_map = dict() |
| 152 | if zero_blocks: |
| 153 | self.file_map["__ZERO"] = RangeSet(data=zero_blocks) |
| 154 | if nonzero_blocks: |
| 155 | self.file_map["__NONZERO"] = RangeSet(data=nonzero_blocks) |
| 156 | if clobbered_blocks: |
| 157 | self.file_map["__COPY"] = RangeSet(data=clobbered_blocks) |
Tao Bao | 7589e96 | 2015-09-05 20:35:32 -0700 | [diff] [blame] | 158 | |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 159 | def _GetRangeData(self, ranges): |
| 160 | for s, e in ranges: |
| 161 | yield self.data[s*self.blocksize:e*self.blocksize] |
| 162 | |
| 163 | def RangeSha1(self, ranges): |
| 164 | h = sha1() |
| 165 | for data in self._GetRangeData(ranges): |
| 166 | h.update(data) |
| 167 | return h.hexdigest() |
| 168 | |
Doug Zongker | ab7ca1d | 2014-08-26 10:40:28 -0700 | [diff] [blame] | 169 | def ReadRangeSet(self, ranges): |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 170 | return [self._GetRangeData(ranges)] |
Doug Zongker | ab7ca1d | 2014-08-26 10:40:28 -0700 | [diff] [blame] | 171 | |
Tao Bao | 68658c0 | 2015-06-01 13:40:49 -0700 | [diff] [blame] | 172 | def TotalSha1(self, include_clobbered_blocks=False): |
Tao Bao | 7589e96 | 2015-09-05 20:35:32 -0700 | [diff] [blame] | 173 | if not include_clobbered_blocks: |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 174 | return self.RangeSha1(self.care_map.subtract(self.clobbered_blocks)) |
Tao Bao | 7589e96 | 2015-09-05 20:35:32 -0700 | [diff] [blame] | 175 | else: |
| 176 | return sha1(self.data).hexdigest() |
Doug Zongker | ab7ca1d | 2014-08-26 10:40:28 -0700 | [diff] [blame] | 177 | |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 178 | def WriteRangeDataToFd(self, ranges, fd): |
| 179 | for data in self._GetRangeData(ranges): |
| 180 | fd.write(data) |
| 181 | |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 182 | |
| 183 | class Transfer(object): |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 184 | def __init__(self, tgt_name, src_name, tgt_ranges, src_ranges, tgt_sha1, |
| 185 | src_sha1, style, by_id): |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 186 | self.tgt_name = tgt_name |
| 187 | self.src_name = src_name |
| 188 | self.tgt_ranges = tgt_ranges |
| 189 | self.src_ranges = src_ranges |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 190 | self.tgt_sha1 = tgt_sha1 |
| 191 | self.src_sha1 = src_sha1 |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 192 | self.style = style |
| 193 | self.intact = (getattr(tgt_ranges, "monotonic", False) and |
| 194 | getattr(src_ranges, "monotonic", False)) |
Tao Bao | b8c8717 | 2015-03-19 19:42:12 -0700 | [diff] [blame] | 195 | |
| 196 | # We use OrderedDict rather than dict so that the output is repeatable; |
| 197 | # otherwise it would depend on the hash values of the Transfer objects. |
| 198 | self.goes_before = OrderedDict() |
| 199 | self.goes_after = OrderedDict() |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 200 | |
Doug Zongker | 6233818 | 2014-09-08 08:29:55 -0700 | [diff] [blame] | 201 | self.stash_before = [] |
| 202 | self.use_stash = [] |
| 203 | |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 204 | self.id = len(by_id) |
| 205 | by_id.append(self) |
| 206 | |
Doug Zongker | 6233818 | 2014-09-08 08:29:55 -0700 | [diff] [blame] | 207 | def NetStashChange(self): |
| 208 | return (sum(sr.size() for (_, sr) in self.stash_before) - |
| 209 | sum(sr.size() for (_, sr) in self.use_stash)) |
| 210 | |
Tao Bao | 82c4798 | 2015-08-17 09:45:13 -0700 | [diff] [blame] | 211 | def ConvertToNew(self): |
| 212 | assert self.style != "new" |
| 213 | self.use_stash = [] |
| 214 | self.style = "new" |
| 215 | self.src_ranges = RangeSet() |
| 216 | |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 217 | def __str__(self): |
| 218 | return (str(self.id) + ": <" + str(self.src_ranges) + " " + self.style + |
| 219 | " to " + str(self.tgt_ranges) + ">") |
| 220 | |
| 221 | |
Doug Zongker | 6ab2a50 | 2016-02-09 08:28:09 -0800 | [diff] [blame] | 222 | @functools.total_ordering |
| 223 | class HeapItem(object): |
| 224 | def __init__(self, item): |
| 225 | self.item = item |
| 226 | # Negate the score since python's heap is a min-heap and we want |
| 227 | # the maximum score. |
| 228 | self.score = -item.score |
| 229 | def clear(self): |
| 230 | self.item = None |
| 231 | def __bool__(self): |
| 232 | return self.item is None |
| 233 | def __eq__(self, other): |
| 234 | return self.score == other.score |
| 235 | def __le__(self, other): |
| 236 | return self.score <= other.score |
| 237 | |
| 238 | |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 239 | # BlockImageDiff works on two image objects. An image object is |
| 240 | # anything that provides the following attributes: |
| 241 | # |
| 242 | # blocksize: the size in bytes of a block, currently must be 4096. |
| 243 | # |
| 244 | # total_blocks: the total size of the partition/image, in blocks. |
| 245 | # |
| 246 | # care_map: a RangeSet containing which blocks (in the range [0, |
| 247 | # total_blocks) we actually care about; i.e. which blocks contain |
| 248 | # data. |
| 249 | # |
| 250 | # file_map: a dict that partitions the blocks contained in care_map |
| 251 | # into smaller domains that are useful for doing diffs on. |
| 252 | # (Typically a domain is a file, and the key in file_map is the |
| 253 | # pathname.) |
| 254 | # |
Tao Bao | ff77781 | 2015-05-12 11:42:31 -0700 | [diff] [blame] | 255 | # clobbered_blocks: a RangeSet containing which blocks contain data |
| 256 | # but may be altered by the FS. They need to be excluded when |
| 257 | # verifying the partition integrity. |
| 258 | # |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 259 | # ReadRangeSet(): a function that takes a RangeSet and returns the |
| 260 | # data contained in the image blocks of that RangeSet. The data |
| 261 | # is returned as a list or tuple of strings; concatenating the |
| 262 | # elements together should produce the requested data. |
| 263 | # Implementations are free to break up the data into list/tuple |
| 264 | # elements in any way that is convenient. |
| 265 | # |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 266 | # RangeSha1(): a function that returns (as a hex string) the SHA-1 |
| 267 | # hash of all the data in the specified range. |
| 268 | # |
Doug Zongker | ab7ca1d | 2014-08-26 10:40:28 -0700 | [diff] [blame] | 269 | # TotalSha1(): a function that returns (as a hex string) the SHA-1 |
| 270 | # hash of all the data in the image (ie, all the blocks in the |
Tao Bao | 68658c0 | 2015-06-01 13:40:49 -0700 | [diff] [blame] | 271 | # care_map minus clobbered_blocks, or including the clobbered |
| 272 | # blocks if include_clobbered_blocks is True). |
Doug Zongker | ab7ca1d | 2014-08-26 10:40:28 -0700 | [diff] [blame] | 273 | # |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 274 | # When creating a BlockImageDiff, the src image may be None, in which |
| 275 | # case the list of transfers produced will never read from the |
| 276 | # original image. |
| 277 | |
| 278 | class BlockImageDiff(object): |
Tao Bao | 293fd13 | 2016-06-11 12:19:23 -0700 | [diff] [blame] | 279 | def __init__(self, tgt, src=None, threads=None, version=4, |
| 280 | disable_imgdiff=False): |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 281 | if threads is None: |
| 282 | threads = multiprocessing.cpu_count() // 2 |
Dan Albert | 8b72aef | 2015-03-23 19:13:21 -0700 | [diff] [blame] | 283 | if threads == 0: |
| 284 | threads = 1 |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 285 | self.threads = threads |
Doug Zongker | 6233818 | 2014-09-08 08:29:55 -0700 | [diff] [blame] | 286 | self.version = version |
Dan Albert | 8b72aef | 2015-03-23 19:13:21 -0700 | [diff] [blame] | 287 | self.transfers = [] |
| 288 | self.src_basenames = {} |
| 289 | self.src_numpatterns = {} |
Tao Bao | b4cfca5 | 2016-02-04 14:26:02 -0800 | [diff] [blame] | 290 | self._max_stashed_size = 0 |
Tao Bao | d522bdc | 2016-04-12 15:53:16 -0700 | [diff] [blame] | 291 | self.touched_src_ranges = RangeSet() |
| 292 | self.touched_src_sha1 = None |
Tao Bao | 293fd13 | 2016-06-11 12:19:23 -0700 | [diff] [blame] | 293 | self.disable_imgdiff = disable_imgdiff |
Doug Zongker | 6233818 | 2014-09-08 08:29:55 -0700 | [diff] [blame] | 294 | |
Tao Bao | 8fad03e | 2017-03-01 14:36:26 -0800 | [diff] [blame] | 295 | assert version in (3, 4) |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 296 | |
| 297 | self.tgt = tgt |
| 298 | if src is None: |
| 299 | src = EmptyImage() |
| 300 | self.src = src |
| 301 | |
| 302 | # The updater code that installs the patch always uses 4k blocks. |
| 303 | assert tgt.blocksize == 4096 |
| 304 | assert src.blocksize == 4096 |
| 305 | |
| 306 | # The range sets in each filemap should comprise a partition of |
| 307 | # the care map. |
| 308 | self.AssertPartition(src.care_map, src.file_map.values()) |
| 309 | self.AssertPartition(tgt.care_map, tgt.file_map.values()) |
| 310 | |
Tao Bao | b4cfca5 | 2016-02-04 14:26:02 -0800 | [diff] [blame] | 311 | @property |
| 312 | def max_stashed_size(self): |
| 313 | return self._max_stashed_size |
| 314 | |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 315 | def Compute(self, prefix): |
| 316 | # When looking for a source file to use as the diff input for a |
| 317 | # target file, we try: |
| 318 | # 1) an exact path match if available, otherwise |
| 319 | # 2) a exact basename match if available, otherwise |
| 320 | # 3) a basename match after all runs of digits are replaced by |
| 321 | # "#" if available, otherwise |
| 322 | # 4) we have no source for this target. |
| 323 | self.AbbreviateSourceNames() |
| 324 | self.FindTransfers() |
| 325 | |
| 326 | # Find the ordering dependencies among transfers (this is O(n^2) |
| 327 | # in the number of transfers). |
| 328 | self.GenerateDigraph() |
| 329 | # Find a sequence of transfers that satisfies as many ordering |
| 330 | # dependencies as possible (heuristically). |
| 331 | self.FindVertexSequence() |
| 332 | # Fix up the ordering dependencies that the sequence didn't |
| 333 | # satisfy. |
Tao Bao | 8fad03e | 2017-03-01 14:36:26 -0800 | [diff] [blame] | 334 | self.ReverseBackwardEdges() |
| 335 | self.ImproveVertexSequence() |
Doug Zongker | 6233818 | 2014-09-08 08:29:55 -0700 | [diff] [blame] | 336 | |
Tao Bao | 82c4798 | 2015-08-17 09:45:13 -0700 | [diff] [blame] | 337 | # Ensure the runtime stash size is under the limit. |
Tao Bao | 8fad03e | 2017-03-01 14:36:26 -0800 | [diff] [blame] | 338 | if common.OPTIONS.cache_size is not None: |
Tao Bao | 82c4798 | 2015-08-17 09:45:13 -0700 | [diff] [blame] | 339 | self.ReviseStashSize() |
| 340 | |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 341 | # Double-check our work. |
| 342 | self.AssertSequenceGood() |
| 343 | |
| 344 | self.ComputePatches(prefix) |
| 345 | self.WriteTransfers(prefix) |
| 346 | |
| 347 | def WriteTransfers(self, prefix): |
Tianjie Xu | 37e2930 | 2016-06-23 16:10:35 -0700 | [diff] [blame] | 348 | def WriteSplitTransfers(out, style, target_blocks): |
| 349 | """Limit the size of operand in command 'new' and 'zero' to 1024 blocks. |
Tianjie Xu | bb848c5 | 2016-06-21 15:54:09 -0700 | [diff] [blame] | 350 | |
| 351 | This prevents the target size of one command from being too large; and |
| 352 | might help to avoid fsync errors on some devices.""" |
| 353 | |
Tao Bao | 3a2e350 | 2016-12-28 09:14:39 -0800 | [diff] [blame] | 354 | assert style == "new" or style == "zero" |
Tianjie Xu | 37e2930 | 2016-06-23 16:10:35 -0700 | [diff] [blame] | 355 | blocks_limit = 1024 |
Tianjie Xu | bb848c5 | 2016-06-21 15:54:09 -0700 | [diff] [blame] | 356 | total = 0 |
Tianjie Xu | 37e2930 | 2016-06-23 16:10:35 -0700 | [diff] [blame] | 357 | while target_blocks: |
| 358 | blocks_to_write = target_blocks.first(blocks_limit) |
| 359 | out.append("%s %s\n" % (style, blocks_to_write.to_string_raw())) |
| 360 | total += blocks_to_write.size() |
| 361 | target_blocks = target_blocks.subtract(blocks_to_write) |
Tianjie Xu | bb848c5 | 2016-06-21 15:54:09 -0700 | [diff] [blame] | 362 | return total |
| 363 | |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 364 | out = [] |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 365 | total = 0 |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 366 | |
Tao Bao | 3a2e350 | 2016-12-28 09:14:39 -0800 | [diff] [blame] | 367 | # In BBOTA v3+, it uses the hash of the stashed blocks as the stash slot |
| 368 | # id. 'stashes' records the map from 'hash' to the ref count. The stash |
| 369 | # will be freed only if the count decrements to zero. |
Doug Zongker | 6233818 | 2014-09-08 08:29:55 -0700 | [diff] [blame] | 370 | stashes = {} |
| 371 | stashed_blocks = 0 |
| 372 | max_stashed_blocks = 0 |
| 373 | |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 374 | for xf in self.transfers: |
| 375 | |
Tao Bao | 8fad03e | 2017-03-01 14:36:26 -0800 | [diff] [blame] | 376 | for _, sr in xf.stash_before: |
| 377 | sh = self.src.RangeSha1(sr) |
| 378 | if sh in stashes: |
| 379 | stashes[sh] += 1 |
Sami Tolvanen | dd67a29 | 2014-12-09 16:40:34 +0000 | [diff] [blame] | 380 | else: |
Tao Bao | 8fad03e | 2017-03-01 14:36:26 -0800 | [diff] [blame] | 381 | stashes[sh] = 1 |
| 382 | stashed_blocks += sr.size() |
| 383 | self.touched_src_ranges = self.touched_src_ranges.union(sr) |
| 384 | out.append("stash %s %s\n" % (sh, sr.to_string_raw())) |
Doug Zongker | 6233818 | 2014-09-08 08:29:55 -0700 | [diff] [blame] | 385 | |
| 386 | if stashed_blocks > max_stashed_blocks: |
| 387 | max_stashed_blocks = stashed_blocks |
| 388 | |
Jesse Zhao | 7b985f6 | 2015-03-02 16:53:08 -0800 | [diff] [blame] | 389 | free_string = [] |
caozhiyuan | 21b37d8 | 2015-10-21 15:14:03 +0800 | [diff] [blame] | 390 | free_size = 0 |
Jesse Zhao | 7b985f6 | 2015-03-02 16:53:08 -0800 | [diff] [blame] | 391 | |
Tao Bao | 8fad03e | 2017-03-01 14:36:26 -0800 | [diff] [blame] | 392 | # <# blocks> <src ranges> |
| 393 | # OR |
| 394 | # <# blocks> <src ranges> <src locs> <stash refs...> |
| 395 | # OR |
| 396 | # <# blocks> - <stash refs...> |
Doug Zongker | 6233818 | 2014-09-08 08:29:55 -0700 | [diff] [blame] | 397 | |
Tao Bao | 8fad03e | 2017-03-01 14:36:26 -0800 | [diff] [blame] | 398 | size = xf.src_ranges.size() |
| 399 | src_str = [str(size)] |
Doug Zongker | 6233818 | 2014-09-08 08:29:55 -0700 | [diff] [blame] | 400 | |
Tao Bao | 8fad03e | 2017-03-01 14:36:26 -0800 | [diff] [blame] | 401 | unstashed_src_ranges = xf.src_ranges |
| 402 | mapped_stashes = [] |
| 403 | for _, sr in xf.use_stash: |
| 404 | unstashed_src_ranges = unstashed_src_ranges.subtract(sr) |
| 405 | sh = self.src.RangeSha1(sr) |
| 406 | sr = xf.src_ranges.map_within(sr) |
| 407 | mapped_stashes.append(sr) |
| 408 | assert sh in stashes |
| 409 | src_str.append("%s:%s" % (sh, sr.to_string_raw())) |
| 410 | stashes[sh] -= 1 |
| 411 | if stashes[sh] == 0: |
| 412 | free_string.append("free %s\n" % (sh,)) |
| 413 | free_size += sr.size() |
| 414 | stashes.pop(sh) |
Doug Zongker | 6233818 | 2014-09-08 08:29:55 -0700 | [diff] [blame] | 415 | |
Tao Bao | 8fad03e | 2017-03-01 14:36:26 -0800 | [diff] [blame] | 416 | if unstashed_src_ranges: |
| 417 | src_str.insert(1, unstashed_src_ranges.to_string_raw()) |
| 418 | if xf.use_stash: |
| 419 | mapped_unstashed = xf.src_ranges.map_within(unstashed_src_ranges) |
| 420 | src_str.insert(2, mapped_unstashed.to_string_raw()) |
| 421 | mapped_stashes.append(mapped_unstashed) |
Doug Zongker | 6233818 | 2014-09-08 08:29:55 -0700 | [diff] [blame] | 422 | self.AssertPartition(RangeSet(data=(0, size)), mapped_stashes) |
Tao Bao | 8fad03e | 2017-03-01 14:36:26 -0800 | [diff] [blame] | 423 | else: |
| 424 | src_str.insert(1, "-") |
| 425 | self.AssertPartition(RangeSet(data=(0, size)), mapped_stashes) |
Doug Zongker | 6233818 | 2014-09-08 08:29:55 -0700 | [diff] [blame] | 426 | |
Tao Bao | 8fad03e | 2017-03-01 14:36:26 -0800 | [diff] [blame] | 427 | src_str = " ".join(src_str) |
Doug Zongker | 6233818 | 2014-09-08 08:29:55 -0700 | [diff] [blame] | 428 | |
Tao Bao | 8fad03e | 2017-03-01 14:36:26 -0800 | [diff] [blame] | 429 | # version 3+: |
Doug Zongker | 6233818 | 2014-09-08 08:29:55 -0700 | [diff] [blame] | 430 | # zero <rangeset> |
| 431 | # new <rangeset> |
| 432 | # erase <rangeset> |
Dan Albert | 8b72aef | 2015-03-23 19:13:21 -0700 | [diff] [blame] | 433 | # bsdiff patchstart patchlen srchash tgthash <tgt rangeset> <src_str> |
| 434 | # imgdiff patchstart patchlen srchash tgthash <tgt rangeset> <src_str> |
| 435 | # move hash <tgt rangeset> <src_str> |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 436 | |
| 437 | tgt_size = xf.tgt_ranges.size() |
| 438 | |
| 439 | if xf.style == "new": |
| 440 | assert xf.tgt_ranges |
Tianjie Xu | 37e2930 | 2016-06-23 16:10:35 -0700 | [diff] [blame] | 441 | assert tgt_size == WriteSplitTransfers(out, xf.style, xf.tgt_ranges) |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 442 | total += tgt_size |
| 443 | elif xf.style == "move": |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 444 | assert xf.tgt_ranges |
| 445 | assert xf.src_ranges.size() == tgt_size |
| 446 | if xf.src_ranges != xf.tgt_ranges: |
Sami Tolvanen | 29f529f | 2015-04-17 16:28:08 +0100 | [diff] [blame] | 447 | # take into account automatic stashing of overlapping blocks |
| 448 | if xf.src_ranges.overlaps(xf.tgt_ranges): |
Tao Bao | e9b6191 | 2015-07-09 17:37:49 -0700 | [diff] [blame] | 449 | temp_stash_usage = stashed_blocks + xf.src_ranges.size() |
Sami Tolvanen | 29f529f | 2015-04-17 16:28:08 +0100 | [diff] [blame] | 450 | if temp_stash_usage > max_stashed_blocks: |
| 451 | max_stashed_blocks = temp_stash_usage |
| 452 | |
Tao Bao | d522bdc | 2016-04-12 15:53:16 -0700 | [diff] [blame] | 453 | self.touched_src_ranges = self.touched_src_ranges.union( |
| 454 | xf.src_ranges) |
| 455 | |
Tao Bao | 8fad03e | 2017-03-01 14:36:26 -0800 | [diff] [blame] | 456 | out.append("%s %s %s %s\n" % ( |
Sami Tolvanen | dd67a29 | 2014-12-09 16:40:34 +0000 | [diff] [blame] | 457 | xf.style, |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 458 | xf.tgt_sha1, |
Dan Albert | 8b72aef | 2015-03-23 19:13:21 -0700 | [diff] [blame] | 459 | xf.tgt_ranges.to_string_raw(), src_str)) |
Tao Bao | 8fad03e | 2017-03-01 14:36:26 -0800 | [diff] [blame] | 460 | total += tgt_size |
| 461 | elif xf.style in ("bsdiff", "imgdiff"): |
| 462 | assert xf.tgt_ranges |
| 463 | assert xf.src_ranges |
| 464 | # take into account automatic stashing of overlapping blocks |
| 465 | if xf.src_ranges.overlaps(xf.tgt_ranges): |
| 466 | temp_stash_usage = stashed_blocks + xf.src_ranges.size() |
| 467 | if temp_stash_usage > max_stashed_blocks: |
| 468 | max_stashed_blocks = temp_stash_usage |
| 469 | |
| 470 | self.touched_src_ranges = self.touched_src_ranges.union(xf.src_ranges) |
| 471 | |
| 472 | out.append("%s %d %d %s %s %s %s\n" % ( |
| 473 | xf.style, |
| 474 | xf.patch_start, xf.patch_len, |
| 475 | xf.src_sha1, |
| 476 | xf.tgt_sha1, |
| 477 | xf.tgt_ranges.to_string_raw(), src_str)) |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 478 | total += tgt_size |
| 479 | elif xf.style == "zero": |
| 480 | assert xf.tgt_ranges |
| 481 | to_zero = xf.tgt_ranges.subtract(xf.src_ranges) |
Tianjie Xu | 37e2930 | 2016-06-23 16:10:35 -0700 | [diff] [blame] | 482 | assert WriteSplitTransfers(out, xf.style, to_zero) == to_zero.size() |
Tianjie Xu | bb848c5 | 2016-06-21 15:54:09 -0700 | [diff] [blame] | 483 | total += to_zero.size() |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 484 | else: |
Dan Albert | 8b72aef | 2015-03-23 19:13:21 -0700 | [diff] [blame] | 485 | raise ValueError("unknown transfer style '%s'\n" % xf.style) |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 486 | |
Sami Tolvanen | dd67a29 | 2014-12-09 16:40:34 +0000 | [diff] [blame] | 487 | if free_string: |
| 488 | out.append("".join(free_string)) |
caozhiyuan | 21b37d8 | 2015-10-21 15:14:03 +0800 | [diff] [blame] | 489 | stashed_blocks -= free_size |
Sami Tolvanen | dd67a29 | 2014-12-09 16:40:34 +0000 | [diff] [blame] | 490 | |
Tao Bao | 8fad03e | 2017-03-01 14:36:26 -0800 | [diff] [blame] | 491 | if common.OPTIONS.cache_size is not None: |
Tao Bao | 8dcf738 | 2015-05-21 14:09:49 -0700 | [diff] [blame] | 492 | # Sanity check: abort if we're going to need more stash space than |
| 493 | # the allowed size (cache_size * threshold). There are two purposes |
| 494 | # of having a threshold here. a) Part of the cache may have been |
| 495 | # occupied by some recovery logs. b) It will buy us some time to deal |
| 496 | # with the oversize issue. |
| 497 | cache_size = common.OPTIONS.cache_size |
| 498 | stash_threshold = common.OPTIONS.stash_threshold |
| 499 | max_allowed = cache_size * stash_threshold |
Tao Bao | e8c68a0 | 2017-02-26 10:48:11 -0800 | [diff] [blame] | 500 | assert max_stashed_blocks * self.tgt.blocksize <= max_allowed, \ |
Tao Bao | 8dcf738 | 2015-05-21 14:09:49 -0700 | [diff] [blame] | 501 | 'Stash size %d (%d * %d) exceeds the limit %d (%d * %.2f)' % ( |
| 502 | max_stashed_blocks * self.tgt.blocksize, max_stashed_blocks, |
| 503 | self.tgt.blocksize, max_allowed, cache_size, |
| 504 | stash_threshold) |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 505 | |
Tao Bao | 8fad03e | 2017-03-01 14:36:26 -0800 | [diff] [blame] | 506 | self.touched_src_sha1 = self.src.RangeSha1(self.touched_src_ranges) |
Tao Bao | d522bdc | 2016-04-12 15:53:16 -0700 | [diff] [blame] | 507 | |
Tao Bao | e9b6191 | 2015-07-09 17:37:49 -0700 | [diff] [blame] | 508 | # Zero out extended blocks as a workaround for bug 20881595. |
| 509 | if self.tgt.extended: |
Tianjie Xu | 37e2930 | 2016-06-23 16:10:35 -0700 | [diff] [blame] | 510 | assert (WriteSplitTransfers(out, "zero", self.tgt.extended) == |
Tianjie Xu | bb848c5 | 2016-06-21 15:54:09 -0700 | [diff] [blame] | 511 | self.tgt.extended.size()) |
Tao Bao | b32d56e | 2015-09-09 11:55:01 -0700 | [diff] [blame] | 512 | total += self.tgt.extended.size() |
Tao Bao | e9b6191 | 2015-07-09 17:37:49 -0700 | [diff] [blame] | 513 | |
| 514 | # We erase all the blocks on the partition that a) don't contain useful |
Tao Bao | 66f1fa6 | 2016-05-03 10:02:01 -0700 | [diff] [blame] | 515 | # data in the new image; b) will not be touched by dm-verity. Out of those |
| 516 | # blocks, we erase the ones that won't be used in this update at the |
| 517 | # beginning of an update. The rest would be erased at the end. This is to |
| 518 | # work around the eMMC issue observed on some devices, which may otherwise |
| 519 | # get starving for clean blocks and thus fail the update. (b/28347095) |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 520 | all_tgt = RangeSet(data=(0, self.tgt.total_blocks)) |
Tao Bao | e9b6191 | 2015-07-09 17:37:49 -0700 | [diff] [blame] | 521 | all_tgt_minus_extended = all_tgt.subtract(self.tgt.extended) |
| 522 | new_dontcare = all_tgt_minus_extended.subtract(self.tgt.care_map) |
Tao Bao | 66f1fa6 | 2016-05-03 10:02:01 -0700 | [diff] [blame] | 523 | |
| 524 | erase_first = new_dontcare.subtract(self.touched_src_ranges) |
| 525 | if erase_first: |
| 526 | out.insert(0, "erase %s\n" % (erase_first.to_string_raw(),)) |
| 527 | |
| 528 | erase_last = new_dontcare.subtract(erase_first) |
| 529 | if erase_last: |
| 530 | out.append("erase %s\n" % (erase_last.to_string_raw(),)) |
Doug Zongker | e985f6f | 2014-09-09 12:38:47 -0700 | [diff] [blame] | 531 | |
| 532 | out.insert(0, "%d\n" % (self.version,)) # format version number |
Tao Bao | b32d56e | 2015-09-09 11:55:01 -0700 | [diff] [blame] | 533 | out.insert(1, "%d\n" % (total,)) |
Tao Bao | 8fad03e | 2017-03-01 14:36:26 -0800 | [diff] [blame] | 534 | # v3+: the number of stash slots is unused. |
| 535 | out.insert(2, "0\n") |
| 536 | out.insert(3, str(max_stashed_blocks) + "\n") |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 537 | |
| 538 | with open(prefix + ".transfer.list", "wb") as f: |
| 539 | for i in out: |
| 540 | f.write(i) |
| 541 | |
Tao Bao | 8fad03e | 2017-03-01 14:36:26 -0800 | [diff] [blame] | 542 | self._max_stashed_size = max_stashed_blocks * self.tgt.blocksize |
| 543 | OPTIONS = common.OPTIONS |
| 544 | if OPTIONS.cache_size is not None: |
| 545 | max_allowed = OPTIONS.cache_size * OPTIONS.stash_threshold |
| 546 | print("max stashed blocks: %d (%d bytes), " |
| 547 | "limit: %d bytes (%.2f%%)\n" % ( |
| 548 | max_stashed_blocks, self._max_stashed_size, max_allowed, |
| 549 | self._max_stashed_size * 100.0 / max_allowed)) |
| 550 | else: |
| 551 | print("max stashed blocks: %d (%d bytes), limit: <unknown>\n" % ( |
| 552 | max_stashed_blocks, self._max_stashed_size)) |
Doug Zongker | 6233818 | 2014-09-08 08:29:55 -0700 | [diff] [blame] | 553 | |
Tao Bao | 82c4798 | 2015-08-17 09:45:13 -0700 | [diff] [blame] | 554 | def ReviseStashSize(self): |
| 555 | print("Revising stash size...") |
Tao Bao | e27acfd | 2016-12-16 11:13:55 -0800 | [diff] [blame] | 556 | stash_map = {} |
Tao Bao | 82c4798 | 2015-08-17 09:45:13 -0700 | [diff] [blame] | 557 | |
| 558 | # Create the map between a stash and its def/use points. For example, for a |
Tao Bao | 3c5a16d | 2017-02-13 11:42:50 -0800 | [diff] [blame] | 559 | # given stash of (raw_id, sr), stash_map[raw_id] = (sr, def_cmd, use_cmd). |
Tao Bao | 82c4798 | 2015-08-17 09:45:13 -0700 | [diff] [blame] | 560 | for xf in self.transfers: |
| 561 | # Command xf defines (stores) all the stashes in stash_before. |
Tao Bao | 3a2e350 | 2016-12-28 09:14:39 -0800 | [diff] [blame] | 562 | for stash_raw_id, sr in xf.stash_before: |
| 563 | stash_map[stash_raw_id] = (sr, xf) |
Tao Bao | 82c4798 | 2015-08-17 09:45:13 -0700 | [diff] [blame] | 564 | |
| 565 | # Record all the stashes command xf uses. |
Tao Bao | 3a2e350 | 2016-12-28 09:14:39 -0800 | [diff] [blame] | 566 | for stash_raw_id, _ in xf.use_stash: |
| 567 | stash_map[stash_raw_id] += (xf,) |
Tao Bao | 82c4798 | 2015-08-17 09:45:13 -0700 | [diff] [blame] | 568 | |
| 569 | # Compute the maximum blocks available for stash based on /cache size and |
| 570 | # the threshold. |
| 571 | cache_size = common.OPTIONS.cache_size |
| 572 | stash_threshold = common.OPTIONS.stash_threshold |
| 573 | max_allowed = cache_size * stash_threshold / self.tgt.blocksize |
| 574 | |
Tao Bao | 3a2e350 | 2016-12-28 09:14:39 -0800 | [diff] [blame] | 575 | # See the comments for 'stashes' in WriteTransfers(). |
Tao Bao | e27acfd | 2016-12-16 11:13:55 -0800 | [diff] [blame] | 576 | stashes = {} |
Tao Bao | 82c4798 | 2015-08-17 09:45:13 -0700 | [diff] [blame] | 577 | stashed_blocks = 0 |
Tao Bao | 9a5caf2 | 2015-08-25 15:10:10 -0700 | [diff] [blame] | 578 | new_blocks = 0 |
Tao Bao | 82c4798 | 2015-08-17 09:45:13 -0700 | [diff] [blame] | 579 | |
| 580 | # Now go through all the commands. Compute the required stash size on the |
| 581 | # fly. If a command requires excess stash than available, it deletes the |
| 582 | # stash by replacing the command that uses the stash with a "new" command |
| 583 | # instead. |
| 584 | for xf in self.transfers: |
| 585 | replaced_cmds = [] |
| 586 | |
| 587 | # xf.stash_before generates explicit stash commands. |
Tao Bao | 3a2e350 | 2016-12-28 09:14:39 -0800 | [diff] [blame] | 588 | for stash_raw_id, sr in xf.stash_before: |
Tao Bao | e27acfd | 2016-12-16 11:13:55 -0800 | [diff] [blame] | 589 | # Check the post-command stashed_blocks. |
| 590 | stashed_blocks_after = stashed_blocks |
Tao Bao | 8fad03e | 2017-03-01 14:36:26 -0800 | [diff] [blame] | 591 | sh = self.src.RangeSha1(sr) |
| 592 | if sh not in stashes: |
Tao Bao | e27acfd | 2016-12-16 11:13:55 -0800 | [diff] [blame] | 593 | stashed_blocks_after += sr.size() |
Tao Bao | e27acfd | 2016-12-16 11:13:55 -0800 | [diff] [blame] | 594 | |
| 595 | if stashed_blocks_after > max_allowed: |
Tao Bao | 82c4798 | 2015-08-17 09:45:13 -0700 | [diff] [blame] | 596 | # We cannot stash this one for a later command. Find out the command |
| 597 | # that will use this stash and replace the command with "new". |
Tao Bao | 3a2e350 | 2016-12-28 09:14:39 -0800 | [diff] [blame] | 598 | use_cmd = stash_map[stash_raw_id][2] |
Tao Bao | 82c4798 | 2015-08-17 09:45:13 -0700 | [diff] [blame] | 599 | replaced_cmds.append(use_cmd) |
Tao Bao | 9a5caf2 | 2015-08-25 15:10:10 -0700 | [diff] [blame] | 600 | print("%10d %9s %s" % (sr.size(), "explicit", use_cmd)) |
Tao Bao | 82c4798 | 2015-08-17 09:45:13 -0700 | [diff] [blame] | 601 | else: |
Tao Bao | 3c5a16d | 2017-02-13 11:42:50 -0800 | [diff] [blame] | 602 | # Update the stashes map. |
Tao Bao | 8fad03e | 2017-03-01 14:36:26 -0800 | [diff] [blame] | 603 | if sh in stashes: |
| 604 | stashes[sh] += 1 |
Tao Bao | 3c5a16d | 2017-02-13 11:42:50 -0800 | [diff] [blame] | 605 | else: |
Tao Bao | 8fad03e | 2017-03-01 14:36:26 -0800 | [diff] [blame] | 606 | stashes[sh] = 1 |
Tao Bao | e27acfd | 2016-12-16 11:13:55 -0800 | [diff] [blame] | 607 | stashed_blocks = stashed_blocks_after |
Tao Bao | 82c4798 | 2015-08-17 09:45:13 -0700 | [diff] [blame] | 608 | |
| 609 | # "move" and "diff" may introduce implicit stashes in BBOTA v3. Prior to |
| 610 | # ComputePatches(), they both have the style of "diff". |
Tao Bao | 8fad03e | 2017-03-01 14:36:26 -0800 | [diff] [blame] | 611 | if xf.style == "diff": |
Tao Bao | 82c4798 | 2015-08-17 09:45:13 -0700 | [diff] [blame] | 612 | assert xf.tgt_ranges and xf.src_ranges |
| 613 | if xf.src_ranges.overlaps(xf.tgt_ranges): |
| 614 | if stashed_blocks + xf.src_ranges.size() > max_allowed: |
| 615 | replaced_cmds.append(xf) |
Tao Bao | 9a5caf2 | 2015-08-25 15:10:10 -0700 | [diff] [blame] | 616 | print("%10d %9s %s" % (xf.src_ranges.size(), "implicit", xf)) |
Tao Bao | 82c4798 | 2015-08-17 09:45:13 -0700 | [diff] [blame] | 617 | |
| 618 | # Replace the commands in replaced_cmds with "new"s. |
| 619 | for cmd in replaced_cmds: |
| 620 | # It no longer uses any commands in "use_stash". Remove the def points |
| 621 | # for all those stashes. |
Tao Bao | 3a2e350 | 2016-12-28 09:14:39 -0800 | [diff] [blame] | 622 | for stash_raw_id, sr in cmd.use_stash: |
| 623 | def_cmd = stash_map[stash_raw_id][1] |
| 624 | assert (stash_raw_id, sr) in def_cmd.stash_before |
| 625 | def_cmd.stash_before.remove((stash_raw_id, sr)) |
Tao Bao | 82c4798 | 2015-08-17 09:45:13 -0700 | [diff] [blame] | 626 | |
Tianjie Xu | ebe39a0 | 2016-01-14 14:12:26 -0800 | [diff] [blame] | 627 | # Add up blocks that violates space limit and print total number to |
| 628 | # screen later. |
| 629 | new_blocks += cmd.tgt_ranges.size() |
Tao Bao | 82c4798 | 2015-08-17 09:45:13 -0700 | [diff] [blame] | 630 | cmd.ConvertToNew() |
| 631 | |
Tao Bao | 3a2e350 | 2016-12-28 09:14:39 -0800 | [diff] [blame] | 632 | # xf.use_stash may generate free commands. |
Tao Bao | 8fad03e | 2017-03-01 14:36:26 -0800 | [diff] [blame] | 633 | for _, sr in xf.use_stash: |
| 634 | sh = self.src.RangeSha1(sr) |
| 635 | assert sh in stashes |
| 636 | stashes[sh] -= 1 |
| 637 | if stashes[sh] == 0: |
Tao Bao | e27acfd | 2016-12-16 11:13:55 -0800 | [diff] [blame] | 638 | stashed_blocks -= sr.size() |
Tao Bao | 8fad03e | 2017-03-01 14:36:26 -0800 | [diff] [blame] | 639 | stashes.pop(sh) |
Tao Bao | e27acfd | 2016-12-16 11:13:55 -0800 | [diff] [blame] | 640 | |
Tianjie Xu | ebe39a0 | 2016-01-14 14:12:26 -0800 | [diff] [blame] | 641 | num_of_bytes = new_blocks * self.tgt.blocksize |
| 642 | print(" Total %d blocks (%d bytes) are packed as new blocks due to " |
| 643 | "insufficient cache size." % (new_blocks, num_of_bytes)) |
Tao Bao | 304ee27 | 2016-12-19 11:01:38 -0800 | [diff] [blame] | 644 | return new_blocks |
Tao Bao | 9a5caf2 | 2015-08-25 15:10:10 -0700 | [diff] [blame] | 645 | |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 646 | def ComputePatches(self, prefix): |
| 647 | print("Reticulating splines...") |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 648 | diff_queue = [] |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 649 | patch_num = 0 |
| 650 | with open(prefix + ".new.dat", "wb") as new_f: |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 651 | for index, xf in enumerate(self.transfers): |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 652 | if xf.style == "zero": |
Tao Bao | 08c8583 | 2016-09-19 22:26:30 -0700 | [diff] [blame] | 653 | tgt_size = xf.tgt_ranges.size() * self.tgt.blocksize |
| 654 | print("%10d %10d (%6.2f%%) %7s %s %s" % ( |
| 655 | tgt_size, tgt_size, 100.0, xf.style, xf.tgt_name, |
| 656 | str(xf.tgt_ranges))) |
| 657 | |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 658 | elif xf.style == "new": |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 659 | self.tgt.WriteRangeDataToFd(xf.tgt_ranges, new_f) |
Tao Bao | 08c8583 | 2016-09-19 22:26:30 -0700 | [diff] [blame] | 660 | tgt_size = xf.tgt_ranges.size() * self.tgt.blocksize |
| 661 | print("%10d %10d (%6.2f%%) %7s %s %s" % ( |
| 662 | tgt_size, tgt_size, 100.0, xf.style, |
| 663 | xf.tgt_name, str(xf.tgt_ranges))) |
| 664 | |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 665 | elif xf.style == "diff": |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 666 | # We can't compare src and tgt directly because they may have |
| 667 | # the same content but be broken up into blocks differently, eg: |
| 668 | # |
| 669 | # ["he", "llo"] vs ["h", "ello"] |
| 670 | # |
| 671 | # We want those to compare equal, ideally without having to |
| 672 | # actually concatenate the strings (these may be tens of |
| 673 | # megabytes). |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 674 | if xf.src_sha1 == xf.tgt_sha1: |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 675 | # These are identical; we don't need to generate a patch, |
| 676 | # just issue copy commands on the device. |
| 677 | xf.style = "move" |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 678 | tgt_size = xf.tgt_ranges.size() * self.tgt.blocksize |
Tao Bao | 08c8583 | 2016-09-19 22:26:30 -0700 | [diff] [blame] | 679 | if xf.src_ranges != xf.tgt_ranges: |
| 680 | print("%10d %10d (%6.2f%%) %7s %s %s (from %s)" % ( |
| 681 | tgt_size, tgt_size, 100.0, xf.style, |
| 682 | xf.tgt_name if xf.tgt_name == xf.src_name else ( |
| 683 | xf.tgt_name + " (from " + xf.src_name + ")"), |
| 684 | str(xf.tgt_ranges), str(xf.src_ranges))) |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 685 | else: |
| 686 | # For files in zip format (eg, APKs, JARs, etc.) we would |
| 687 | # like to use imgdiff -z if possible (because it usually |
| 688 | # produces significantly smaller patches than bsdiff). |
| 689 | # This is permissible if: |
| 690 | # |
Tao Bao | 293fd13 | 2016-06-11 12:19:23 -0700 | [diff] [blame] | 691 | # - imgdiff is not disabled, and |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 692 | # - the source and target files are monotonic (ie, the |
| 693 | # data is stored with blocks in increasing order), and |
| 694 | # - we haven't removed any blocks from the source set. |
| 695 | # |
| 696 | # If these conditions are satisfied then appending all the |
| 697 | # blocks in the set together in order will produce a valid |
| 698 | # zip file (plus possibly extra zeros in the last block), |
| 699 | # which is what imgdiff needs to operate. (imgdiff is |
| 700 | # fine with extra zeros at the end of the file.) |
Tao Bao | 293fd13 | 2016-06-11 12:19:23 -0700 | [diff] [blame] | 701 | imgdiff = (not self.disable_imgdiff and xf.intact and |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 702 | xf.tgt_name.split(".")[-1].lower() |
| 703 | in ("apk", "jar", "zip")) |
| 704 | xf.style = "imgdiff" if imgdiff else "bsdiff" |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 705 | diff_queue.append((index, imgdiff, patch_num)) |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 706 | patch_num += 1 |
| 707 | |
| 708 | else: |
| 709 | assert False, "unknown style " + xf.style |
| 710 | |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 711 | if diff_queue: |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 712 | if self.threads > 1: |
| 713 | print("Computing patches (using %d threads)..." % (self.threads,)) |
| 714 | else: |
| 715 | print("Computing patches...") |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 716 | |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 717 | diff_total = len(diff_queue) |
| 718 | patches = [None] * diff_total |
Tianjie Xu | b59c17f | 2016-10-28 17:55:53 -0700 | [diff] [blame^] | 719 | error_messages = [] |
Tao Bao | 33635b1 | 2017-03-12 13:02:51 -0700 | [diff] [blame] | 720 | if sys.stdout.isatty(): |
| 721 | global diff_done |
| 722 | diff_done = 0 |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 723 | |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 724 | # Using multiprocessing doesn't give additional benefits, due to the |
| 725 | # pattern of the code. The diffing work is done by subprocess.call, which |
| 726 | # already runs in a separate process (not affected much by the GIL - |
| 727 | # Global Interpreter Lock). Using multiprocess also requires either a) |
| 728 | # writing the diff input files in the main process before forking, or b) |
| 729 | # reopening the image file (SparseImage) in the worker processes. Doing |
| 730 | # neither of them further improves the performance. |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 731 | lock = threading.Lock() |
| 732 | def diff_worker(): |
| 733 | while True: |
| 734 | with lock: |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 735 | if not diff_queue: |
Dan Albert | 8b72aef | 2015-03-23 19:13:21 -0700 | [diff] [blame] | 736 | return |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 737 | xf_index, imgdiff, patch_index = diff_queue.pop() |
| 738 | |
| 739 | xf = self.transfers[xf_index] |
| 740 | src_ranges = xf.src_ranges |
| 741 | tgt_ranges = xf.tgt_ranges |
| 742 | |
| 743 | # Needs lock since WriteRangeDataToFd() is stateful (calling seek). |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 744 | with lock: |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 745 | src_file = common.MakeTempFile(prefix="src-") |
| 746 | with open(src_file, "wb") as fd: |
| 747 | self.src.WriteRangeDataToFd(src_ranges, fd) |
| 748 | |
| 749 | tgt_file = common.MakeTempFile(prefix="tgt-") |
| 750 | with open(tgt_file, "wb") as fd: |
| 751 | self.tgt.WriteRangeDataToFd(tgt_ranges, fd) |
| 752 | |
| 753 | try: |
| 754 | patch = compute_patch(src_file, tgt_file, imgdiff) |
| 755 | except ValueError as e: |
Tianjie Xu | b59c17f | 2016-10-28 17:55:53 -0700 | [diff] [blame^] | 756 | with lock: |
| 757 | error_messages.append( |
| 758 | "Failed to generate %s for %s: tgt=%s, src=%s:\n%s" % ( |
| 759 | "imgdiff" if imgdiff else "bsdiff", |
| 760 | xf.tgt_name if xf.tgt_name == xf.src_name else |
| 761 | xf.tgt_name + " (from " + xf.src_name + ")", |
| 762 | xf.tgt_ranges, xf.src_ranges, e.message)) |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 763 | |
| 764 | with lock: |
| 765 | patches[patch_index] = (xf_index, patch) |
| 766 | if sys.stdout.isatty(): |
Tao Bao | 33635b1 | 2017-03-12 13:02:51 -0700 | [diff] [blame] | 767 | global diff_done |
| 768 | diff_done += 1 |
| 769 | progress = diff_done * 100 / diff_total |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 770 | # '\033[K' is to clear to EOL. |
| 771 | print(' [%d%%] %s\033[K' % (progress, xf.tgt_name), end='\r') |
| 772 | sys.stdout.flush() |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 773 | |
| 774 | threads = [threading.Thread(target=diff_worker) |
Dan Albert | 8b72aef | 2015-03-23 19:13:21 -0700 | [diff] [blame] | 775 | for _ in range(self.threads)] |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 776 | for th in threads: |
| 777 | th.start() |
| 778 | while threads: |
| 779 | threads.pop().join() |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 780 | |
| 781 | if sys.stdout.isatty(): |
| 782 | print('\n') |
Tianjie Xu | b59c17f | 2016-10-28 17:55:53 -0700 | [diff] [blame^] | 783 | |
| 784 | if error_messages: |
| 785 | print('\n'.join(error_messages)) |
| 786 | sys.exit(1) |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 787 | else: |
| 788 | patches = [] |
| 789 | |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 790 | offset = 0 |
| 791 | with open(prefix + ".patch.dat", "wb") as patch_fd: |
| 792 | for index, patch in patches: |
| 793 | xf = self.transfers[index] |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 794 | xf.patch_len = len(patch) |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 795 | xf.patch_start = offset |
| 796 | offset += xf.patch_len |
| 797 | patch_fd.write(patch) |
| 798 | |
| 799 | if common.OPTIONS.verbose: |
| 800 | tgt_size = xf.tgt_ranges.size() * self.tgt.blocksize |
| 801 | print("%10d %10d (%6.2f%%) %7s %s %s %s" % ( |
| 802 | xf.patch_len, tgt_size, xf.patch_len * 100.0 / tgt_size, |
| 803 | xf.style, |
| 804 | xf.tgt_name if xf.tgt_name == xf.src_name else ( |
| 805 | xf.tgt_name + " (from " + xf.src_name + ")"), |
| 806 | xf.tgt_ranges, xf.src_ranges)) |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 807 | |
| 808 | def AssertSequenceGood(self): |
| 809 | # Simulate the sequences of transfers we will output, and check that: |
| 810 | # - we never read a block after writing it, and |
| 811 | # - we write every block we care about exactly once. |
| 812 | |
| 813 | # Start with no blocks having been touched yet. |
Doug Zongker | 6ab2a50 | 2016-02-09 08:28:09 -0800 | [diff] [blame] | 814 | touched = array.array("B", "\0" * self.tgt.total_blocks) |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 815 | |
| 816 | # Imagine processing the transfers in order. |
| 817 | for xf in self.transfers: |
| 818 | # Check that the input blocks for this transfer haven't yet been touched. |
Doug Zongker | 6233818 | 2014-09-08 08:29:55 -0700 | [diff] [blame] | 819 | |
| 820 | x = xf.src_ranges |
Tao Bao | 8fad03e | 2017-03-01 14:36:26 -0800 | [diff] [blame] | 821 | for _, sr in xf.use_stash: |
| 822 | x = x.subtract(sr) |
Doug Zongker | 6233818 | 2014-09-08 08:29:55 -0700 | [diff] [blame] | 823 | |
Doug Zongker | 6ab2a50 | 2016-02-09 08:28:09 -0800 | [diff] [blame] | 824 | for s, e in x: |
Tao Bao | ff75c23 | 2016-03-04 15:23:34 -0800 | [diff] [blame] | 825 | # Source image could be larger. Don't check the blocks that are in the |
| 826 | # source image only. Since they are not in 'touched', and won't ever |
| 827 | # be touched. |
| 828 | for i in range(s, min(e, self.tgt.total_blocks)): |
Doug Zongker | 6ab2a50 | 2016-02-09 08:28:09 -0800 | [diff] [blame] | 829 | assert touched[i] == 0 |
| 830 | |
| 831 | # Check that the output blocks for this transfer haven't yet |
| 832 | # been touched, and touch all the blocks written by this |
| 833 | # transfer. |
| 834 | for s, e in xf.tgt_ranges: |
| 835 | for i in range(s, e): |
| 836 | assert touched[i] == 0 |
| 837 | touched[i] = 1 |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 838 | |
| 839 | # Check that we've written every target block. |
Doug Zongker | 6ab2a50 | 2016-02-09 08:28:09 -0800 | [diff] [blame] | 840 | for s, e in self.tgt.care_map: |
| 841 | for i in range(s, e): |
| 842 | assert touched[i] == 1 |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 843 | |
Doug Zongker | 6233818 | 2014-09-08 08:29:55 -0700 | [diff] [blame] | 844 | def ImproveVertexSequence(self): |
| 845 | print("Improving vertex order...") |
| 846 | |
| 847 | # At this point our digraph is acyclic; we reversed any edges that |
| 848 | # were backwards in the heuristically-generated sequence. The |
| 849 | # previously-generated order is still acceptable, but we hope to |
| 850 | # find a better order that needs less memory for stashed data. |
| 851 | # Now we do a topological sort to generate a new vertex order, |
| 852 | # using a greedy algorithm to choose which vertex goes next |
| 853 | # whenever we have a choice. |
| 854 | |
| 855 | # Make a copy of the edge set; this copy will get destroyed by the |
| 856 | # algorithm. |
| 857 | for xf in self.transfers: |
| 858 | xf.incoming = xf.goes_after.copy() |
| 859 | xf.outgoing = xf.goes_before.copy() |
| 860 | |
| 861 | L = [] # the new vertex order |
| 862 | |
| 863 | # S is the set of sources in the remaining graph; we always choose |
| 864 | # the one that leaves the least amount of stashed data after it's |
| 865 | # executed. |
| 866 | S = [(u.NetStashChange(), u.order, u) for u in self.transfers |
| 867 | if not u.incoming] |
| 868 | heapq.heapify(S) |
| 869 | |
| 870 | while S: |
| 871 | _, _, xf = heapq.heappop(S) |
| 872 | L.append(xf) |
| 873 | for u in xf.outgoing: |
| 874 | del u.incoming[xf] |
| 875 | if not u.incoming: |
| 876 | heapq.heappush(S, (u.NetStashChange(), u.order, u)) |
| 877 | |
| 878 | # if this fails then our graph had a cycle. |
| 879 | assert len(L) == len(self.transfers) |
| 880 | |
| 881 | self.transfers = L |
| 882 | for i, xf in enumerate(L): |
| 883 | xf.order = i |
| 884 | |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 885 | def RemoveBackwardEdges(self): |
| 886 | print("Removing backward edges...") |
| 887 | in_order = 0 |
| 888 | out_of_order = 0 |
| 889 | lost_source = 0 |
| 890 | |
| 891 | for xf in self.transfers: |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 892 | lost = 0 |
| 893 | size = xf.src_ranges.size() |
| 894 | for u in xf.goes_before: |
| 895 | # xf should go before u |
| 896 | if xf.order < u.order: |
| 897 | # it does, hurray! |
Doug Zongker | 6233818 | 2014-09-08 08:29:55 -0700 | [diff] [blame] | 898 | in_order += 1 |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 899 | else: |
| 900 | # it doesn't, boo. trim the blocks that u writes from xf's |
| 901 | # source, so that xf can go after u. |
Doug Zongker | 6233818 | 2014-09-08 08:29:55 -0700 | [diff] [blame] | 902 | out_of_order += 1 |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 903 | assert xf.src_ranges.overlaps(u.tgt_ranges) |
| 904 | xf.src_ranges = xf.src_ranges.subtract(u.tgt_ranges) |
| 905 | xf.intact = False |
| 906 | |
| 907 | if xf.style == "diff" and not xf.src_ranges: |
| 908 | # nothing left to diff from; treat as new data |
| 909 | xf.style = "new" |
| 910 | |
| 911 | lost = size - xf.src_ranges.size() |
| 912 | lost_source += lost |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 913 | |
| 914 | print((" %d/%d dependencies (%.2f%%) were violated; " |
| 915 | "%d source blocks removed.") % |
| 916 | (out_of_order, in_order + out_of_order, |
| 917 | (out_of_order * 100.0 / (in_order + out_of_order)) |
| 918 | if (in_order + out_of_order) else 0.0, |
| 919 | lost_source)) |
| 920 | |
Doug Zongker | 6233818 | 2014-09-08 08:29:55 -0700 | [diff] [blame] | 921 | def ReverseBackwardEdges(self): |
Tao Bao | 3a2e350 | 2016-12-28 09:14:39 -0800 | [diff] [blame] | 922 | """Reverse unsatisfying edges and compute pairs of stashed blocks. |
| 923 | |
| 924 | For each transfer, make sure it properly stashes the blocks it touches and |
| 925 | will be used by later transfers. It uses pairs of (stash_raw_id, range) to |
| 926 | record the blocks to be stashed. 'stash_raw_id' is an id that uniquely |
| 927 | identifies each pair. Note that for the same range (e.g. RangeSet("1-5")), |
| 928 | it is possible to have multiple pairs with different 'stash_raw_id's. Each |
| 929 | 'stash_raw_id' will be consumed by one transfer. In BBOTA v3+, identical |
| 930 | blocks will be written to the same stash slot in WriteTransfers(). |
| 931 | """ |
| 932 | |
Doug Zongker | 6233818 | 2014-09-08 08:29:55 -0700 | [diff] [blame] | 933 | print("Reversing backward edges...") |
| 934 | in_order = 0 |
| 935 | out_of_order = 0 |
Tao Bao | 3a2e350 | 2016-12-28 09:14:39 -0800 | [diff] [blame] | 936 | stash_raw_id = 0 |
Doug Zongker | 6233818 | 2014-09-08 08:29:55 -0700 | [diff] [blame] | 937 | stash_size = 0 |
| 938 | |
| 939 | for xf in self.transfers: |
Doug Zongker | 6233818 | 2014-09-08 08:29:55 -0700 | [diff] [blame] | 940 | for u in xf.goes_before.copy(): |
| 941 | # xf should go before u |
| 942 | if xf.order < u.order: |
| 943 | # it does, hurray! |
| 944 | in_order += 1 |
| 945 | else: |
| 946 | # it doesn't, boo. modify u to stash the blocks that it |
| 947 | # writes that xf wants to read, and then require u to go |
| 948 | # before xf. |
| 949 | out_of_order += 1 |
| 950 | |
| 951 | overlap = xf.src_ranges.intersect(u.tgt_ranges) |
| 952 | assert overlap |
| 953 | |
Tao Bao | 3a2e350 | 2016-12-28 09:14:39 -0800 | [diff] [blame] | 954 | u.stash_before.append((stash_raw_id, overlap)) |
| 955 | xf.use_stash.append((stash_raw_id, overlap)) |
| 956 | stash_raw_id += 1 |
Doug Zongker | 6233818 | 2014-09-08 08:29:55 -0700 | [diff] [blame] | 957 | stash_size += overlap.size() |
| 958 | |
| 959 | # reverse the edge direction; now xf must go after u |
| 960 | del xf.goes_before[u] |
| 961 | del u.goes_after[xf] |
| 962 | xf.goes_after[u] = None # value doesn't matter |
| 963 | u.goes_before[xf] = None |
| 964 | |
| 965 | print((" %d/%d dependencies (%.2f%%) were violated; " |
| 966 | "%d source blocks stashed.") % |
| 967 | (out_of_order, in_order + out_of_order, |
| 968 | (out_of_order * 100.0 / (in_order + out_of_order)) |
| 969 | if (in_order + out_of_order) else 0.0, |
| 970 | stash_size)) |
| 971 | |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 972 | def FindVertexSequence(self): |
| 973 | print("Finding vertex sequence...") |
| 974 | |
| 975 | # This is based on "A Fast & Effective Heuristic for the Feedback |
| 976 | # Arc Set Problem" by P. Eades, X. Lin, and W.F. Smyth. Think of |
| 977 | # it as starting with the digraph G and moving all the vertices to |
| 978 | # be on a horizontal line in some order, trying to minimize the |
| 979 | # number of edges that end up pointing to the left. Left-pointing |
| 980 | # edges will get removed to turn the digraph into a DAG. In this |
| 981 | # case each edge has a weight which is the number of source blocks |
| 982 | # we'll lose if that edge is removed; we try to minimize the total |
| 983 | # weight rather than just the number of edges. |
| 984 | |
| 985 | # Make a copy of the edge set; this copy will get destroyed by the |
| 986 | # algorithm. |
| 987 | for xf in self.transfers: |
| 988 | xf.incoming = xf.goes_after.copy() |
| 989 | xf.outgoing = xf.goes_before.copy() |
Doug Zongker | 6ab2a50 | 2016-02-09 08:28:09 -0800 | [diff] [blame] | 990 | xf.score = sum(xf.outgoing.values()) - sum(xf.incoming.values()) |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 991 | |
| 992 | # We use an OrderedDict instead of just a set so that the output |
| 993 | # is repeatable; otherwise it would depend on the hash values of |
| 994 | # the transfer objects. |
| 995 | G = OrderedDict() |
| 996 | for xf in self.transfers: |
| 997 | G[xf] = None |
| 998 | s1 = deque() # the left side of the sequence, built from left to right |
| 999 | s2 = deque() # the right side of the sequence, built from right to left |
| 1000 | |
Doug Zongker | 6ab2a50 | 2016-02-09 08:28:09 -0800 | [diff] [blame] | 1001 | heap = [] |
| 1002 | for xf in self.transfers: |
| 1003 | xf.heap_item = HeapItem(xf) |
| 1004 | heap.append(xf.heap_item) |
| 1005 | heapq.heapify(heap) |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 1006 | |
Tao Bao | 3348228 | 2016-10-24 16:49:08 -0700 | [diff] [blame] | 1007 | # Use OrderedDict() instead of set() to preserve the insertion order. Need |
| 1008 | # to use 'sinks[key] = None' to add key into the set. sinks will look like |
| 1009 | # { key1: None, key2: None, ... }. |
| 1010 | sinks = OrderedDict.fromkeys(u for u in G if not u.outgoing) |
| 1011 | sources = OrderedDict.fromkeys(u for u in G if not u.incoming) |
Doug Zongker | 6ab2a50 | 2016-02-09 08:28:09 -0800 | [diff] [blame] | 1012 | |
| 1013 | def adjust_score(iu, delta): |
| 1014 | iu.score += delta |
| 1015 | iu.heap_item.clear() |
| 1016 | iu.heap_item = HeapItem(iu) |
| 1017 | heapq.heappush(heap, iu.heap_item) |
| 1018 | |
| 1019 | while G: |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 1020 | # Put all sinks at the end of the sequence. |
Doug Zongker | 6ab2a50 | 2016-02-09 08:28:09 -0800 | [diff] [blame] | 1021 | while sinks: |
Tao Bao | 3348228 | 2016-10-24 16:49:08 -0700 | [diff] [blame] | 1022 | new_sinks = OrderedDict() |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 1023 | for u in sinks: |
Doug Zongker | 6ab2a50 | 2016-02-09 08:28:09 -0800 | [diff] [blame] | 1024 | if u not in G: continue |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 1025 | s2.appendleft(u) |
| 1026 | del G[u] |
| 1027 | for iu in u.incoming: |
Doug Zongker | 6ab2a50 | 2016-02-09 08:28:09 -0800 | [diff] [blame] | 1028 | adjust_score(iu, -iu.outgoing.pop(u)) |
Tao Bao | 3348228 | 2016-10-24 16:49:08 -0700 | [diff] [blame] | 1029 | if not iu.outgoing: |
| 1030 | new_sinks[iu] = None |
Doug Zongker | 6ab2a50 | 2016-02-09 08:28:09 -0800 | [diff] [blame] | 1031 | sinks = new_sinks |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 1032 | |
| 1033 | # Put all the sources at the beginning of the sequence. |
Doug Zongker | 6ab2a50 | 2016-02-09 08:28:09 -0800 | [diff] [blame] | 1034 | while sources: |
Tao Bao | 3348228 | 2016-10-24 16:49:08 -0700 | [diff] [blame] | 1035 | new_sources = OrderedDict() |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 1036 | for u in sources: |
Doug Zongker | 6ab2a50 | 2016-02-09 08:28:09 -0800 | [diff] [blame] | 1037 | if u not in G: continue |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 1038 | s1.append(u) |
| 1039 | del G[u] |
| 1040 | for iu in u.outgoing: |
Doug Zongker | 6ab2a50 | 2016-02-09 08:28:09 -0800 | [diff] [blame] | 1041 | adjust_score(iu, +iu.incoming.pop(u)) |
Tao Bao | 3348228 | 2016-10-24 16:49:08 -0700 | [diff] [blame] | 1042 | if not iu.incoming: |
| 1043 | new_sources[iu] = None |
Doug Zongker | 6ab2a50 | 2016-02-09 08:28:09 -0800 | [diff] [blame] | 1044 | sources = new_sources |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 1045 | |
Doug Zongker | 6ab2a50 | 2016-02-09 08:28:09 -0800 | [diff] [blame] | 1046 | if not G: break |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 1047 | |
| 1048 | # Find the "best" vertex to put next. "Best" is the one that |
| 1049 | # maximizes the net difference in source blocks saved we get by |
| 1050 | # pretending it's a source rather than a sink. |
| 1051 | |
Doug Zongker | 6ab2a50 | 2016-02-09 08:28:09 -0800 | [diff] [blame] | 1052 | while True: |
| 1053 | u = heapq.heappop(heap) |
| 1054 | if u and u.item in G: |
| 1055 | u = u.item |
| 1056 | break |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 1057 | |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 1058 | s1.append(u) |
| 1059 | del G[u] |
| 1060 | for iu in u.outgoing: |
Doug Zongker | 6ab2a50 | 2016-02-09 08:28:09 -0800 | [diff] [blame] | 1061 | adjust_score(iu, +iu.incoming.pop(u)) |
Tao Bao | 3348228 | 2016-10-24 16:49:08 -0700 | [diff] [blame] | 1062 | if not iu.incoming: |
| 1063 | sources[iu] = None |
Doug Zongker | 6ab2a50 | 2016-02-09 08:28:09 -0800 | [diff] [blame] | 1064 | |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 1065 | for iu in u.incoming: |
Doug Zongker | 6ab2a50 | 2016-02-09 08:28:09 -0800 | [diff] [blame] | 1066 | adjust_score(iu, -iu.outgoing.pop(u)) |
Tao Bao | 3348228 | 2016-10-24 16:49:08 -0700 | [diff] [blame] | 1067 | if not iu.outgoing: |
| 1068 | sinks[iu] = None |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 1069 | |
| 1070 | # Now record the sequence in the 'order' field of each transfer, |
| 1071 | # and by rearranging self.transfers to be in the chosen sequence. |
| 1072 | |
| 1073 | new_transfers = [] |
| 1074 | for x in itertools.chain(s1, s2): |
| 1075 | x.order = len(new_transfers) |
| 1076 | new_transfers.append(x) |
| 1077 | del x.incoming |
| 1078 | del x.outgoing |
| 1079 | |
| 1080 | self.transfers = new_transfers |
| 1081 | |
| 1082 | def GenerateDigraph(self): |
| 1083 | print("Generating digraph...") |
Doug Zongker | 6ab2a50 | 2016-02-09 08:28:09 -0800 | [diff] [blame] | 1084 | |
| 1085 | # Each item of source_ranges will be: |
| 1086 | # - None, if that block is not used as a source, |
Tao Bao | 3348228 | 2016-10-24 16:49:08 -0700 | [diff] [blame] | 1087 | # - an ordered set of transfers. |
Doug Zongker | 6ab2a50 | 2016-02-09 08:28:09 -0800 | [diff] [blame] | 1088 | source_ranges = [] |
| 1089 | for b in self.transfers: |
| 1090 | for s, e in b.src_ranges: |
| 1091 | if e > len(source_ranges): |
| 1092 | source_ranges.extend([None] * (e-len(source_ranges))) |
| 1093 | for i in range(s, e): |
| 1094 | if source_ranges[i] is None: |
Tao Bao | 3348228 | 2016-10-24 16:49:08 -0700 | [diff] [blame] | 1095 | source_ranges[i] = OrderedDict.fromkeys([b]) |
Doug Zongker | 6ab2a50 | 2016-02-09 08:28:09 -0800 | [diff] [blame] | 1096 | else: |
Tao Bao | 3348228 | 2016-10-24 16:49:08 -0700 | [diff] [blame] | 1097 | source_ranges[i][b] = None |
Doug Zongker | 6ab2a50 | 2016-02-09 08:28:09 -0800 | [diff] [blame] | 1098 | |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 1099 | for a in self.transfers: |
Tao Bao | 3348228 | 2016-10-24 16:49:08 -0700 | [diff] [blame] | 1100 | intersections = OrderedDict() |
Doug Zongker | 6ab2a50 | 2016-02-09 08:28:09 -0800 | [diff] [blame] | 1101 | for s, e in a.tgt_ranges: |
| 1102 | for i in range(s, e): |
| 1103 | if i >= len(source_ranges): break |
Tao Bao | 3348228 | 2016-10-24 16:49:08 -0700 | [diff] [blame] | 1104 | # Add all the Transfers in source_ranges[i] to the (ordered) set. |
| 1105 | if source_ranges[i] is not None: |
| 1106 | for j in source_ranges[i]: |
| 1107 | intersections[j] = None |
Doug Zongker | 6ab2a50 | 2016-02-09 08:28:09 -0800 | [diff] [blame] | 1108 | |
| 1109 | for b in intersections: |
| 1110 | if a is b: continue |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 1111 | |
| 1112 | # If the blocks written by A are read by B, then B needs to go before A. |
| 1113 | i = a.tgt_ranges.intersect(b.src_ranges) |
| 1114 | if i: |
Doug Zongker | ab7ca1d | 2014-08-26 10:40:28 -0700 | [diff] [blame] | 1115 | if b.src_name == "__ZERO": |
| 1116 | # the cost of removing source blocks for the __ZERO domain |
| 1117 | # is (nearly) zero. |
| 1118 | size = 0 |
| 1119 | else: |
| 1120 | size = i.size() |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 1121 | b.goes_before[a] = size |
| 1122 | a.goes_after[b] = size |
| 1123 | |
| 1124 | def FindTransfers(self): |
Tao Bao | 9a5caf2 | 2015-08-25 15:10:10 -0700 | [diff] [blame] | 1125 | """Parse the file_map to generate all the transfers.""" |
| 1126 | |
Tao Bao | 08c8583 | 2016-09-19 22:26:30 -0700 | [diff] [blame] | 1127 | def AddSplitTransfers(tgt_name, src_name, tgt_ranges, src_ranges, |
| 1128 | style, by_id): |
| 1129 | """Add one or multiple Transfer()s by splitting large files. |
Tao Bao | 9a5caf2 | 2015-08-25 15:10:10 -0700 | [diff] [blame] | 1130 | |
| 1131 | For BBOTA v3, we need to stash source blocks for resumable feature. |
| 1132 | However, with the growth of file size and the shrink of the cache |
| 1133 | partition source blocks are too large to be stashed. If a file occupies |
Tao Bao | 08c8583 | 2016-09-19 22:26:30 -0700 | [diff] [blame] | 1134 | too many blocks, we split it into smaller pieces by getting multiple |
| 1135 | Transfer()s. |
Tao Bao | 9a5caf2 | 2015-08-25 15:10:10 -0700 | [diff] [blame] | 1136 | |
Tianjie Xu | bb86e1d | 2016-01-13 16:14:10 -0800 | [diff] [blame] | 1137 | The downside is that after splitting, we may increase the package size |
| 1138 | since the split pieces don't align well. According to our experiments, |
| 1139 | 1/8 of the cache size as the per-piece limit appears to be optimal. |
| 1140 | Compared to the fixed 1024-block limit, it reduces the overall package |
Tao Bao | 08c8583 | 2016-09-19 22:26:30 -0700 | [diff] [blame] | 1141 | size by 30% for volantis, and 20% for angler and bullhead.""" |
Tao Bao | 9a5caf2 | 2015-08-25 15:10:10 -0700 | [diff] [blame] | 1142 | |
Tao Bao | 08c8583 | 2016-09-19 22:26:30 -0700 | [diff] [blame] | 1143 | # Possibly split large files into smaller chunks. |
Tianjie Xu | bb86e1d | 2016-01-13 16:14:10 -0800 | [diff] [blame] | 1144 | pieces = 0 |
| 1145 | cache_size = common.OPTIONS.cache_size |
| 1146 | split_threshold = 0.125 |
| 1147 | max_blocks_per_transfer = int(cache_size * split_threshold / |
| 1148 | self.tgt.blocksize) |
| 1149 | |
Tao Bao | 9a5caf2 | 2015-08-25 15:10:10 -0700 | [diff] [blame] | 1150 | # Change nothing for small files. |
Tianjie Xu | bb86e1d | 2016-01-13 16:14:10 -0800 | [diff] [blame] | 1151 | if (tgt_ranges.size() <= max_blocks_per_transfer and |
| 1152 | src_ranges.size() <= max_blocks_per_transfer): |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 1153 | Transfer(tgt_name, src_name, tgt_ranges, src_ranges, |
| 1154 | self.tgt.RangeSha1(tgt_ranges), self.src.RangeSha1(src_ranges), |
| 1155 | style, by_id) |
Tao Bao | 9a5caf2 | 2015-08-25 15:10:10 -0700 | [diff] [blame] | 1156 | return |
| 1157 | |
Tianjie Xu | bb86e1d | 2016-01-13 16:14:10 -0800 | [diff] [blame] | 1158 | while (tgt_ranges.size() > max_blocks_per_transfer and |
| 1159 | src_ranges.size() > max_blocks_per_transfer): |
Tao Bao | 9a5caf2 | 2015-08-25 15:10:10 -0700 | [diff] [blame] | 1160 | tgt_split_name = "%s-%d" % (tgt_name, pieces) |
| 1161 | src_split_name = "%s-%d" % (src_name, pieces) |
Tianjie Xu | bb86e1d | 2016-01-13 16:14:10 -0800 | [diff] [blame] | 1162 | tgt_first = tgt_ranges.first(max_blocks_per_transfer) |
| 1163 | src_first = src_ranges.first(max_blocks_per_transfer) |
| 1164 | |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 1165 | Transfer(tgt_split_name, src_split_name, tgt_first, src_first, |
| 1166 | self.tgt.RangeSha1(tgt_first), self.src.RangeSha1(src_first), |
| 1167 | style, by_id) |
Tao Bao | 9a5caf2 | 2015-08-25 15:10:10 -0700 | [diff] [blame] | 1168 | |
| 1169 | tgt_ranges = tgt_ranges.subtract(tgt_first) |
| 1170 | src_ranges = src_ranges.subtract(src_first) |
| 1171 | pieces += 1 |
| 1172 | |
| 1173 | # Handle remaining blocks. |
| 1174 | if tgt_ranges.size() or src_ranges.size(): |
| 1175 | # Must be both non-empty. |
| 1176 | assert tgt_ranges.size() and src_ranges.size() |
| 1177 | tgt_split_name = "%s-%d" % (tgt_name, pieces) |
| 1178 | src_split_name = "%s-%d" % (src_name, pieces) |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 1179 | Transfer(tgt_split_name, src_split_name, tgt_ranges, src_ranges, |
| 1180 | self.tgt.RangeSha1(tgt_ranges), self.src.RangeSha1(src_ranges), |
| 1181 | style, by_id) |
Tao Bao | 9a5caf2 | 2015-08-25 15:10:10 -0700 | [diff] [blame] | 1182 | |
Tao Bao | 08c8583 | 2016-09-19 22:26:30 -0700 | [diff] [blame] | 1183 | def AddTransfer(tgt_name, src_name, tgt_ranges, src_ranges, style, by_id, |
| 1184 | split=False): |
| 1185 | """Wrapper function for adding a Transfer().""" |
| 1186 | |
| 1187 | # We specialize diff transfers only (which covers bsdiff/imgdiff/move); |
| 1188 | # otherwise add the Transfer() as is. |
| 1189 | if style != "diff" or not split: |
Tao Bao | 183e56e | 2017-03-05 17:05:09 -0800 | [diff] [blame] | 1190 | Transfer(tgt_name, src_name, tgt_ranges, src_ranges, |
| 1191 | self.tgt.RangeSha1(tgt_ranges), self.src.RangeSha1(src_ranges), |
| 1192 | style, by_id) |
Tao Bao | 08c8583 | 2016-09-19 22:26:30 -0700 | [diff] [blame] | 1193 | return |
| 1194 | |
| 1195 | # Handle .odex files specially to analyze the block-wise difference. If |
| 1196 | # most of the blocks are identical with only few changes (e.g. header), |
| 1197 | # we will patch the changed blocks only. This avoids stashing unchanged |
| 1198 | # blocks while patching. We limit the analysis to files without size |
| 1199 | # changes only. This is to avoid sacrificing the OTA generation cost too |
| 1200 | # much. |
| 1201 | if (tgt_name.split(".")[-1].lower() == 'odex' and |
| 1202 | tgt_ranges.size() == src_ranges.size()): |
| 1203 | |
| 1204 | # 0.5 threshold can be further tuned. The tradeoff is: if only very |
| 1205 | # few blocks remain identical, we lose the opportunity to use imgdiff |
| 1206 | # that may have better compression ratio than bsdiff. |
| 1207 | crop_threshold = 0.5 |
| 1208 | |
| 1209 | tgt_skipped = RangeSet() |
| 1210 | src_skipped = RangeSet() |
| 1211 | tgt_size = tgt_ranges.size() |
| 1212 | tgt_changed = 0 |
| 1213 | for src_block, tgt_block in zip(src_ranges.next_item(), |
| 1214 | tgt_ranges.next_item()): |
| 1215 | src_rs = RangeSet(str(src_block)) |
| 1216 | tgt_rs = RangeSet(str(tgt_block)) |
| 1217 | if self.src.ReadRangeSet(src_rs) == self.tgt.ReadRangeSet(tgt_rs): |
| 1218 | tgt_skipped = tgt_skipped.union(tgt_rs) |
| 1219 | src_skipped = src_skipped.union(src_rs) |
| 1220 | else: |
| 1221 | tgt_changed += tgt_rs.size() |
| 1222 | |
| 1223 | # Terminate early if no clear sign of benefits. |
| 1224 | if tgt_changed > tgt_size * crop_threshold: |
| 1225 | break |
| 1226 | |
| 1227 | if tgt_changed < tgt_size * crop_threshold: |
| 1228 | assert tgt_changed + tgt_skipped.size() == tgt_size |
| 1229 | print('%10d %10d (%6.2f%%) %s' % (tgt_skipped.size(), tgt_size, |
| 1230 | tgt_skipped.size() * 100.0 / tgt_size, tgt_name)) |
| 1231 | AddSplitTransfers( |
| 1232 | "%s-skipped" % (tgt_name,), |
| 1233 | "%s-skipped" % (src_name,), |
| 1234 | tgt_skipped, src_skipped, style, by_id) |
| 1235 | |
| 1236 | # Intentionally change the file extension to avoid being imgdiff'd as |
| 1237 | # the files are no longer in their original format. |
| 1238 | tgt_name = "%s-cropped" % (tgt_name,) |
| 1239 | src_name = "%s-cropped" % (src_name,) |
| 1240 | tgt_ranges = tgt_ranges.subtract(tgt_skipped) |
| 1241 | src_ranges = src_ranges.subtract(src_skipped) |
| 1242 | |
| 1243 | # Possibly having no changed blocks. |
| 1244 | if not tgt_ranges: |
| 1245 | return |
| 1246 | |
| 1247 | # Add the transfer(s). |
| 1248 | AddSplitTransfers( |
| 1249 | tgt_name, src_name, tgt_ranges, src_ranges, style, by_id) |
| 1250 | |
| 1251 | print("Finding transfers...") |
| 1252 | |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 1253 | empty = RangeSet() |
| 1254 | for tgt_fn, tgt_ranges in self.tgt.file_map.items(): |
| 1255 | if tgt_fn == "__ZERO": |
| 1256 | # the special "__ZERO" domain is all the blocks not contained |
| 1257 | # in any file and that are filled with zeros. We have a |
| 1258 | # special transfer style for zero blocks. |
| 1259 | src_ranges = self.src.file_map.get("__ZERO", empty) |
Tao Bao | 9a5caf2 | 2015-08-25 15:10:10 -0700 | [diff] [blame] | 1260 | AddTransfer(tgt_fn, "__ZERO", tgt_ranges, src_ranges, |
| 1261 | "zero", self.transfers) |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 1262 | continue |
| 1263 | |
Tao Bao | ff77781 | 2015-05-12 11:42:31 -0700 | [diff] [blame] | 1264 | elif tgt_fn == "__COPY": |
| 1265 | # "__COPY" domain includes all the blocks not contained in any |
| 1266 | # file and that need to be copied unconditionally to the target. |
Tao Bao | 9a5caf2 | 2015-08-25 15:10:10 -0700 | [diff] [blame] | 1267 | AddTransfer(tgt_fn, None, tgt_ranges, empty, "new", self.transfers) |
Tao Bao | ff77781 | 2015-05-12 11:42:31 -0700 | [diff] [blame] | 1268 | continue |
| 1269 | |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 1270 | elif tgt_fn in self.src.file_map: |
| 1271 | # Look for an exact pathname match in the source. |
Tao Bao | 9a5caf2 | 2015-08-25 15:10:10 -0700 | [diff] [blame] | 1272 | AddTransfer(tgt_fn, tgt_fn, tgt_ranges, self.src.file_map[tgt_fn], |
Tao Bao | 8fad03e | 2017-03-01 14:36:26 -0800 | [diff] [blame] | 1273 | "diff", self.transfers, True) |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 1274 | continue |
| 1275 | |
| 1276 | b = os.path.basename(tgt_fn) |
| 1277 | if b in self.src_basenames: |
| 1278 | # Look for an exact basename match in the source. |
| 1279 | src_fn = self.src_basenames[b] |
Tao Bao | 9a5caf2 | 2015-08-25 15:10:10 -0700 | [diff] [blame] | 1280 | AddTransfer(tgt_fn, src_fn, tgt_ranges, self.src.file_map[src_fn], |
Tao Bao | 8fad03e | 2017-03-01 14:36:26 -0800 | [diff] [blame] | 1281 | "diff", self.transfers, True) |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 1282 | continue |
| 1283 | |
| 1284 | b = re.sub("[0-9]+", "#", b) |
| 1285 | if b in self.src_numpatterns: |
| 1286 | # Look for a 'number pattern' match (a basename match after |
| 1287 | # all runs of digits are replaced by "#"). (This is useful |
| 1288 | # for .so files that contain version numbers in the filename |
| 1289 | # that get bumped.) |
| 1290 | src_fn = self.src_numpatterns[b] |
Tao Bao | 9a5caf2 | 2015-08-25 15:10:10 -0700 | [diff] [blame] | 1291 | AddTransfer(tgt_fn, src_fn, tgt_ranges, self.src.file_map[src_fn], |
Tao Bao | 8fad03e | 2017-03-01 14:36:26 -0800 | [diff] [blame] | 1292 | "diff", self.transfers, True) |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 1293 | continue |
| 1294 | |
Tao Bao | 9a5caf2 | 2015-08-25 15:10:10 -0700 | [diff] [blame] | 1295 | AddTransfer(tgt_fn, None, tgt_ranges, empty, "new", self.transfers) |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 1296 | |
| 1297 | def AbbreviateSourceNames(self): |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 1298 | for k in self.src.file_map.keys(): |
| 1299 | b = os.path.basename(k) |
| 1300 | self.src_basenames[b] = k |
| 1301 | b = re.sub("[0-9]+", "#", b) |
| 1302 | self.src_numpatterns[b] = k |
| 1303 | |
| 1304 | @staticmethod |
| 1305 | def AssertPartition(total, seq): |
| 1306 | """Assert that all the RangeSets in 'seq' form a partition of the |
| 1307 | 'total' RangeSet (ie, they are nonintersecting and their union |
| 1308 | equals 'total').""" |
Doug Zongker | 6ab2a50 | 2016-02-09 08:28:09 -0800 | [diff] [blame] | 1309 | |
Doug Zongker | fc44a51 | 2014-08-26 13:10:25 -0700 | [diff] [blame] | 1310 | so_far = RangeSet() |
| 1311 | for i in seq: |
| 1312 | assert not so_far.overlaps(i) |
| 1313 | so_far = so_far.union(i) |
| 1314 | assert so_far == total |