update_engine: UM: Separate global P2P usage from payload-specific attributes.
This change is needed for two reasons: (a) The decision regarding the
global P2P enabled state and those pertaining to whether individual
payloads may be downloaded and/or shared via P2P have distinct and not
necessarily nested lifespans. (b) Some parts of the update engine are
concerned with the former and some with the latter, and so we need
separate entry points in the Update Manager to accommodate that.
This also introduces two Omaha-derived values, denoting whether P2P
downloading and/or sharing should be disabled for the current payload,
into the UpdateCanStart policy.
BUG=chromium:425233
TEST=Unit tests.
Change-Id: I0ba0090bd4c5ceb0c812ea218b070945083abd95
Reviewed-on: https://chromium-review.googlesource.com/225150
Tested-by: Gilad Arnold <garnold@chromium.org>
Reviewed-by: Alex Deymo <deymo@chromium.org>
Commit-Queue: Gilad Arnold <garnold@chromium.org>
diff --git a/update_manager/policy.h b/update_manager/policy.h
index 42f4e15..be30f26 100644
--- a/update_manager/policy.h
+++ b/update_manager/policy.h
@@ -86,6 +86,9 @@
// timestamp when it occurred.
std::vector<std::tuple<int, chromeos_update_engine::ErrorCode, base::Time>>
download_errors;
+ // Whether Omaha forbids use of P2P for downloading and/or sharing.
+ bool p2p_downloading_disabled;
+ bool p2p_sharing_disabled;
// The number of P2P download attempts and wallclock-based time when P2P
// download was first attempted.
int p2p_num_attempts;
@@ -195,6 +198,12 @@
if (reinterpret_cast<typeof(&Policy::UpdateDownloadAllowed)>(
policy_method) == &Policy::UpdateDownloadAllowed)
return class_name + "UpdateDownloadAllowed";
+ if (reinterpret_cast<typeof(&Policy::P2PEnabled)>(
+ policy_method) == &Policy::P2PEnabled)
+ return class_name + "P2PEnabled";
+ if (reinterpret_cast<typeof(&Policy::P2PEnabledChanged)>(
+ policy_method) == &Policy::P2PEnabledChanged)
+ return class_name + "P2PEnabledChanged";
NOTREACHED();
return class_name + "(unknown)";
@@ -239,6 +248,21 @@
std::string* error,
bool* result) const = 0;
+ // Checks whether P2P is enabled. This may consult device policy and other
+ // global settings.
+ virtual EvalStatus P2PEnabled(
+ EvaluationContext* ec, State* state, std::string* error,
+ bool* result) const = 0;
+
+ // Checks whether P2P is enabled, but blocks (returns
+ // |EvalStatus::kAskMeAgainLater|) until it is different from |prev_result|.
+ // If the P2P enabled status is not expected to change, will return
+ // immediately with |EvalStatus::kSucceeded|. This internally uses the
+ // P2PEnabled() policy above.
+ virtual EvalStatus P2PEnabledChanged(
+ EvaluationContext* ec, State* state, std::string* error,
+ bool* result, bool prev_result) const = 0;
+
protected:
Policy() {}