diff options
author | Samuel Huang <huangs@chromium.org> | 2018-03-13 18:19:34 +0000 |
---|---|---|
committer | Edward Lesmes <ehmaldonado@google.com> | 2021-07-23 21:50:59 +0000 |
commit | 06f1ae9aaca969ee95ef840f22b6b461c304542d (patch) | |
tree | f1e5c6624e70628e81fbf38d6cd14b974abe5d93 /equivalence_map.h | |
download | zucchini-06f1ae9aaca969ee95ef840f22b6b461c304542d.tar.gz |
[Zucchini] Move Zucchini from /chrome/installer/ to /components/.
(Use "git log --follow" to see older revisions of files).
/components/ is the most logical place to put Zucchini, which only
depends on /base and /testing/gtest. This move also enables Zucchini to
be used by the Component Updater. Details:
- Move all files; run the following to change deps and guards:
sed 's/chrome\/installer/components/' *.cc *.h -i
sed 's/CHROME_INSTALLER/COMPONENTS/' *.cc *.h -i
- Sorting works out pretty well!
- Change all 'chrome/installer/zucchini' to 'components/zucchini'
throughout other parts of the repo; sort if necessary.
- Fix 6 'git cl lint' errors.
- Change 1 Bind() usage to BindRepeated().
- Update OWNER.
Bug: 729154
Change-Id: I50c5a7d411ea85f707b5994ab319dfb2a1acccf7
Reviewed-on: https://chromium-review.googlesource.com/954923
Reviewed-by: Greg Thompson <grt@chromium.org>
Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Reviewed-by: Samuel Huang <huangs@chromium.org>
Commit-Queue: Samuel Huang <huangs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#542857}
NOKEYCHECK=True
GitOrigin-RevId: 577ef6c435e8d43be6e3e60ccbcbd1881780f4ec
Diffstat (limited to 'equivalence_map.h')
-rw-r--r-- | equivalence_map.h | 183 |
1 files changed, 183 insertions, 0 deletions
diff --git a/equivalence_map.h b/equivalence_map.h new file mode 100644 index 0000000..91b215c --- /dev/null +++ b/equivalence_map.h @@ -0,0 +1,183 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef COMPONENTS_ZUCCHINI_EQUIVALENCE_MAP_H_ +#define COMPONENTS_ZUCCHINI_EQUIVALENCE_MAP_H_ + +#include <stddef.h> + +#include <limits> +#include <vector> + +#include "components/zucchini/image_index.h" +#include "components/zucchini/image_utils.h" +#include "components/zucchini/targets_affinity.h" + +namespace zucchini { + +constexpr double kMismatchFatal = -std::numeric_limits<double>::infinity(); + +class EncodedView; +class EquivalenceSource; + +// Returns similarity score between a token (raw byte or first byte of a +// reference) in |old_image_index| at |src| and a token in |new_image_index| +// at |dst|. |targets_affinities| describes affinities for each target pool and +// is used to evaluate similarity between references, hence it's size must be +// equal to the number of pools in both |old_image_index| and |new_image_index|. +// Both |src| and |dst| must refer to tokens in |old_image_index| and +// |new_image_index|. +double GetTokenSimilarity( + const ImageIndex& old_image_index, + const ImageIndex& new_image_index, + const std::vector<TargetsAffinity>& targets_affinities, + offset_t src, + offset_t dst); + +// Returns a similarity score between content in |old_image_index| and +// |new_image_index| at regions described by |equivalence|, using +// |targets_affinities| to evaluate similarity between references. +double GetEquivalenceSimilarity( + const ImageIndex& old_image_index, + const ImageIndex& new_image_index, + const std::vector<TargetsAffinity>& targets_affinities, + const Equivalence& equivalence); + +// Extends |equivalence| forward and returns the result. This is related to +// VisitEquivalenceSeed(). +EquivalenceCandidate ExtendEquivalenceForward( + const ImageIndex& old_image_index, + const ImageIndex& new_image_index, + const std::vector<TargetsAffinity>& targets_affinities, + const EquivalenceCandidate& equivalence, + double min_similarity); + +// Extends |equivalence| backward and returns the result. This is related to +// VisitEquivalenceSeed(). +EquivalenceCandidate ExtendEquivalenceBackward( + const ImageIndex& old_image_index, + const ImageIndex& new_image_index, + const std::vector<TargetsAffinity>& targets_affinities, + const EquivalenceCandidate& equivalence, + double min_similarity); + +// Creates an equivalence, starting with |src| and |dst| as offset hint, and +// extends it both forward and backward, trying to maximise similarity between +// |old_image_index| and |new_image_index|, and returns the result. +// |targets_affinities| is used to evaluate similarity between references. +// |min_similarity| describes the minimum acceptable similarity score and is +// used as threshold to discard bad equivalences. +EquivalenceCandidate VisitEquivalenceSeed( + const ImageIndex& old_image_index, + const ImageIndex& new_image_index, + const std::vector<TargetsAffinity>& targets_affinities, + offset_t src, + offset_t dst, + double min_similarity); + +// Container of pruned equivalences used to map offsets from |old_image| to +// offsets in |new_image|. Equivalences are pruned by cropping smaller +// equivalences to avoid overlaps, to make the equivalence map (for covered +// bytes in |old_image| and |new_image|) one-to-one. +class OffsetMapper { + public: + using const_iterator = std::vector<Equivalence>::const_iterator; + + // Constructors for various data sources. + // - From a list of |equivalences|, already sorted (by |src_offset|) and + // pruned, useful for tests. + explicit OffsetMapper(std::vector<Equivalence>&& equivalences); + // - From a generator, useful for Zucchini-apply. + explicit OffsetMapper(EquivalenceSource&& equivalence_source); + // - From an EquivalenceMap that needs to be processed, useful for + // Zucchini-gen. + explicit OffsetMapper(const EquivalenceMap& equivalence_map); + ~OffsetMapper(); + + size_t size() const { return equivalences_.size(); } + const_iterator begin() const { return equivalences_.begin(); } + const_iterator end() const { return equivalences_.end(); } + + // Returns an offset in |new_image| corresponding to |offset| in |old_image|. + // If |offset| is not part of an equivalence, the equivalence nearest to + // |offset| is used as if it contained |offset|. This assumes |equivalences_| + // is not empty. + offset_t ForwardProject(offset_t offset) const; + + // Given sorted |offsets|, applies a projection in-place of all offsets that + // are part of a pruned equivalence from |old_image| to |new_image|. Other + // offsets are removed from |offsets|. + void ForwardProjectAll(std::vector<offset_t>* offsets) const; + + // Accessor for testing. + const std::vector<Equivalence> equivalences() const { return equivalences_; } + + // Sorts |equivalences| by |src_offset| and removes all source overlaps; so a + // source location that was covered by some Equivalence would become covered + // by exactly one Equivalence. Moreover, for the offset, the equivalence + // corresponds to the largest (pre-pruning) covering Equivalence, and in case + // of a tie, the Equivalence with minimal |src_offset|. |equivalences| may + // change in size since empty Equivalences are removed. + static void PruneEquivalencesAndSortBySource( + std::vector<Equivalence>* equivalences); + + private: + std::vector<Equivalence> equivalences_; +}; + +// Container of equivalences between |old_image_index| and |new_image_index|, +// sorted by |Equivalence::dst_offset|, only used during patch generation. +class EquivalenceMap { + public: + using const_iterator = std::vector<EquivalenceCandidate>::const_iterator; + + EquivalenceMap(); + // Initializes the object with |equivalences|. + explicit EquivalenceMap(std::vector<EquivalenceCandidate>&& candidates); + EquivalenceMap(EquivalenceMap&&); + EquivalenceMap(const EquivalenceMap&) = delete; + ~EquivalenceMap(); + + // Finds relevant equivalences between |old_view| and |new_view|, using + // suffix array |old_sa| computed from |old_view| and using + // |targets_affinities| to evaluate similarity between references. This + // function is not symmetric. Equivalences might overlap in |old_view|, but + // not in |new_view|. It tries to maximize accumulated similarity within each + // equivalence, while maximizing |new_view| coverage. The minimum similarity + // of an equivalence is given by |min_similarity|. + void Build(const std::vector<offset_t>& old_sa, + const EncodedView& old_view, + const EncodedView& new_view, + const std::vector<TargetsAffinity>& targets_affinities, + double min_similarity); + + size_t size() const { return candidates_.size(); } + const_iterator begin() const { return candidates_.begin(); } + const_iterator end() const { return candidates_.end(); } + + private: + // Discovers equivalence candidates between |old_view| and |new_view| and + // stores them in the object. Note that resulting candidates are not sorted + // and might be overlapping in new image. + void CreateCandidates(const std::vector<offset_t>& old_sa, + const EncodedView& old_view, + const EncodedView& new_view, + const std::vector<TargetsAffinity>& targets_affinities, + double min_similarity); + // Sorts candidates by their offset in new image. + void SortByDestination(); + // Visits |candidates_| (sorted by |dst_offset|) and remove all destination + // overlaps. Candidates with low similarity scores are more likely to be + // shrunken. Unfit candidates may be removed. + void Prune(const EncodedView& old_view, + const EncodedView& new_view, + const std::vector<TargetsAffinity>& targets_affinities, + double min_similarity); + + std::vector<EquivalenceCandidate> candidates_; +}; + +} // namespace zucchini + +#endif // COMPONENTS_ZUCCHINI_EQUIVALENCE_MAP_H_ |