Making cookies eviction quotas match spec
According to the section 3 and section 5 in
https://tools.ietf.org/html/draft-west-cookie-priority-
00#section-3, the old cookie monster implementation doesn't
maintain priority quotas correctly.
This CL makes sure there will always be at least 30 low
priority cookies, 50 mid priority and 70 high priority
cookies if there had been enough of them before the eviction.
Please note, secure cookies are more important than non-secure
per https://tools.ietf.org/html/draft-west-leave-secure-cookies-alone.
A small example: if there are 70 cookies:
37 non-secure low priority and 33 secure low priority
cookies, 37 non-secure cookies are deleted during the first
round and other 3 secure low priority cookies are deleted
during the following round preserving 30 low priority
cookies according to the quota of those specific cookies.
For a bigger example that fully complies with the
implementation, check the unittests.
Before the fix, the unittests were just adjusted to the
behavior of cookies eviction.
For example, if we take the following unittest:
Round 1 => 10L; round 2 => 11M, 10L; round 3 => none.
TestPriorityCookieCase(cm.get(), "11HN 10MN 20LN 110MN 20LN
10HN", 20U,109U, 21U, 150U, 0U);
The problem here was that there were only 40 low priority
cookies, but the quota was not preserved for those cookies.
First, 10 low priority cookies were deleted and then more 10
low priority cookies were deleted leaving only 20 of them,
which was less than the quota (30 low priority cookies).
It happened because the eviction algorithm didn't know how
many cookies of a specific priority were deleted and
it had always started to delete all the cookies from the
beginning of the container removing even those cookies
that shouldn't have been deleted.
After we land this CL, we can have cookies in any order and
high priority cookies will be eventually deleted in order
to avoid excess of high priority cookies by some
applications within the same domain. Thus, after the
eviction algorithm runs, we should have at least 30 low, 50
mid and 70 high priority cookies if we had sufficient
amount of them in the beginning.
BUG=609550
Review-Url: https://codereview.chromium.org/1976073002
Cr-Commit-Position: refs/heads/master@{#398049}
diff --git a/net/cookies/cookie_monster.cc b/net/cookies/cookie_monster.cc
index 3d7124d..e295d39 100644
--- a/net/cookies/cookie_monster.cc
+++ b/net/cookies/cookie_monster.cc
@@ -309,53 +309,27 @@
proxy->PostTask(FROM_HERE, base::Bind(callback, cookie, removed));
}
-size_t CountProtectedSecureCookiesAtPriority(
- CookiePriority priority,
- CookieMonster::CookieItVector* cookies) {
- size_t num_protected_secure_cookies = 0;
- for (const auto& cookie : *cookies) {
- if (!cookie->second->IsSecure())
- continue;
- // 1) At low-priority, only low-priority secure cookies are protected as
- // part of the quota.
- // 2) At medium-priority, only medium-priority secure cookies are protected
- // as part of the quota (low-priority secure cookies may be deleted).
- // 3) At high-priority, medium-priority and high-priority secure cookies are
- // protected as part of the quota (low-priority secure cookies may be
- // deleted).
- CookiePriority cookie_priority = cookie->second->Priority();
- switch (cookie_priority) {
- case COOKIE_PRIORITY_LOW:
- if (priority == COOKIE_PRIORITY_LOW)
- num_protected_secure_cookies++;
- break;
- case COOKIE_PRIORITY_MEDIUM:
- case COOKIE_PRIORITY_HIGH:
- if (cookie_priority <= priority)
- num_protected_secure_cookies++;
- break;
- }
- }
-
- return num_protected_secure_cookies;
-}
-
bool IsCookieEligibleForEviction(CookiePriority current_priority_level,
bool protect_secure_cookies,
const CanonicalCookie* cookie) {
- if (!cookie->IsSecure() || !protect_secure_cookies)
- return cookie->Priority() <= current_priority_level;
+ if (cookie->Priority() == current_priority_level && protect_secure_cookies)
+ return !cookie->IsSecure();
- // Special consideration has to be given for low-priority secure cookies since
- // they are given lower prority than non-secure medium-priority and non-secure
- // high-priority cookies. Thus, low-priority secure cookies may be evicted at
- // a medium and high value of |current_priority_level|. Put another way,
- // low-priority secure cookies are only protected when the current priority
- // level is low.
- if (current_priority_level == COOKIE_PRIORITY_LOW)
- return false;
+ return cookie->Priority() == current_priority_level;
+}
- return cookie->Priority() == COOKIE_PRIORITY_LOW;
+size_t CountCookiesForPossibleDeletion(
+ CookiePriority priority,
+ const CookieMonster::CookieItVector* cookies,
+ bool protect_secure_cookies) {
+ size_t cookies_count = 0U;
+ for (const auto& cookie : *cookies) {
+ if (cookie->second->Priority() == priority) {
+ if (!protect_secure_cookies || cookie->second->IsSecure())
+ cookies_count++;
+ }
+ }
+ return cookies_count;
}
} // namespace
@@ -1928,10 +1902,6 @@
// Sort the cookies by access date, from least-recent to most-recent.
std::sort(cookie_its->begin(), cookie_its->end(), LRACookieSorter);
- size_t additional_quota_low = kDomainCookiesQuotaLow;
- size_t additional_quota_medium = kDomainCookiesQuotaMedium;
- size_t additional_quota_high = kDomainCookiesQuotaHigh;
-
// Remove all but the kDomainCookiesQuotaLow most-recently accessed
// cookies with low-priority. Then, if cookies still need to be removed,
// bump the quota and remove low- and medium-priority. Then, if cookies
@@ -1969,26 +1939,24 @@
if (!enforce_strict_secure && purge_round.protect_secure_cookies)
continue;
- // Only adjust the quota if the round is executing, otherwise it is
- // necesary to delay quota adjustments until a later round. This is
- // because if the high priority, non-secure round is skipped, its quota
- // should not count until the later high priority, full round later.
- size_t* additional_quota = nullptr;
+ // Adjust quota according to the priority of cookies. Each round should
+ // protect certain number of cookies in order to avoid starvation.
+ // For example, when each round starts to remove cookies, the number of
+ // cookies of that priority are counted and a decision whether they
+ // should be deleted or not is made. If yes, some number of cookies of
+ // that priority are deleted considering the quota.
switch (purge_round.priority) {
case COOKIE_PRIORITY_LOW:
- additional_quota = &additional_quota_low;
+ quota = kDomainCookiesQuotaLow;
break;
case COOKIE_PRIORITY_MEDIUM:
- additional_quota = &additional_quota_medium;
+ quota = kDomainCookiesQuotaMedium;
break;
case COOKIE_PRIORITY_HIGH:
- additional_quota = &additional_quota_high;
+ quota = kDomainCookiesQuotaHigh;
break;
}
- quota += *additional_quota;
- *additional_quota = 0u;
size_t just_deleted = 0u;
-
// Purge up to |purge_goal| for all cookies at the given priority. This
// path will always execute if strict secure cookies is disabled since
// |purge_goal| must be positive because of the for-loop guard. If
@@ -2058,45 +2026,44 @@
bool protect_secure_cookies) {
DCHECK(thread_checker_.CalledOnValidThread());
- // Find the first protected cookie by walking down from the end of the list
- // cookie list (most-recently accessed) until |to_protect| cookies that match
- // |priority| are found.
- //
- // If |protect_secure_cookies| is true, do a first pass that counts eligible
- // secure cookies at the specified priority as protected.
+ // 1. Count number of the cookies at |priority|
+ size_t cookies_count_possibly_to_be_deleted = CountCookiesForPossibleDeletion(
+ priority, cookies, false /* count all cookies */);
+
+ // 2. If |cookies_count_possibly_to_be_deleted| at |priority| is less than or
+ // equal |to_protect|, skip round in order to preserve the quota. This
+ // involves secure and non-secure cookies at |priority|.
+ if (cookies_count_possibly_to_be_deleted <= to_protect)
+ return 0u;
+
+ // 3. Calculate number of secure cookies at |priority|
+ // and number of cookies at |priority| that can possibly be deleted.
+ // It is guaranteed we do not delete more than |purge_goal| even if
+ // |cookies_count_possibly_to_be_deleted| is higher.
+ size_t secure_cookies = 0u;
if (protect_secure_cookies) {
- to_protect -= std::min(
- to_protect, CountProtectedSecureCookiesAtPriority(priority, cookies));
+ secure_cookies = CountCookiesForPossibleDeletion(
+ priority, cookies, protect_secure_cookies /* count secure cookies */);
+ cookies_count_possibly_to_be_deleted -=
+ std::max(secure_cookies, to_protect - secure_cookies);
+ } else {
+ cookies_count_possibly_to_be_deleted -= to_protect;
}
- size_t protection_boundary = cookies->size();
- while (to_protect > 0 && protection_boundary > 0) {
- protection_boundary--;
- if (cookies->at(protection_boundary)->second->Priority() <= priority)
- to_protect--;
- }
-
- // Now, walk up from the beginning of the list (least-recently accessed) until
- // |purge_goal| cookies are removed, or the iterator hits
- // |protection_boundary|.
- size_t removed = 0;
- size_t current = 0;
- while (removed < purge_goal && current < protection_boundary) {
+ size_t removed = 0u;
+ size_t current = 0u;
+ while ((removed < purge_goal && current < cookies->size()) &&
+ cookies_count_possibly_to_be_deleted > 0) {
const CanonicalCookie* current_cookie = cookies->at(current)->second;
- // Only delete the current cookie if the priority is less than or equal to
- // the current level. If it is equal to the current level, and secure
- // cookies are protected, only delete it if it is not secure.
+ // Only delete the current cookie if the priority is equal to
+ // the current level.
if (IsCookieEligibleForEviction(priority, protect_secure_cookies,
current_cookie)) {
InternalDeleteCookie(cookies->at(current), true,
DELETE_COOKIE_EVICTED_DOMAIN);
cookies->erase(cookies->begin() + current);
removed++;
-
- // The call to 'erase' above shifts the contents of the vector, but
- // doesn't shift |protection_boundary|. Decrement that here to ensure that
- // the correct set of cookies is protected.
- protection_boundary--;
+ cookies_count_possibly_to_be_deleted--;
} else {
current++;
}
diff --git a/net/cookies/cookie_monster_unittest.cc b/net/cookies/cookie_monster_unittest.cc
index ab74c667..4e3f9ca6 100644
--- a/net/cookies/cookie_monster_unittest.cc
+++ b/net/cookies/cookie_monster_unittest.cc
@@ -565,15 +565,15 @@
TestPriorityCookieCase(cm.get(), "10HN 171MN", 0U, 140U, 10U, 150U, 0U);
// Round 1 => 10L; round2 => 21M; round 3 => none.
TestPriorityCookieCase(cm.get(), "141MN 40LN", 30U, 120U, 0U, 150U, 0U);
- // Round 1 => none; round2 => none; round 3 => 31H.
- TestPriorityCookieCase(cm.get(), "101HN 80MN", 0U, 80U, 70U, 150U, 0U);
+ // Round 1 => none; round2 => 30M; round 3 => 1H.
+ TestPriorityCookieCase(cm.get(), "101HN 80MN", 0U, 50U, 100U, 150U, 0U);
// For {low, medium} priorities right on quota, different orders.
- // Round 1 => 1L; round 2 => none, round3 => 30L.
- TestPriorityCookieCase(cm.get(), "31LN 50MN 100HN", 0U, 50U, 100U, 150U,
+ // Round 1 => 1L; round 2 => none, round3 => 30H.
+ TestPriorityCookieCase(cm.get(), "31LN 50MN 100HN", 30U, 50U, 70U, 150U,
0U);
- // Round 1 => none; round 2 => 1M, round3 => 30M.
- TestPriorityCookieCase(cm.get(), "51MN 100HN 30LN", 30U, 20U, 100U, 150U,
+ // Round 1 => none; round 2 => 1M, round3 => 30H.
+ TestPriorityCookieCase(cm.get(), "51MN 100HN 30LN", 30U, 50U, 70U, 150U,
0U);
// Round 1 => none; round 2 => none; round3 => 31H.
TestPriorityCookieCase(cm.get(), "101HN 50MN 30LN", 30U, 50U, 70U, 150U,
@@ -586,45 +586,21 @@
// Round 1 => 10L; round 2 => 10M; round 3 => 11H.
TestPriorityCookieCase(cm.get(), "21HN 60MN 40LN 60HN", 30U, 50U, 70U, 150U,
0U);
- // Round 1 => 10L; round 2 => 11M, 10L; round 3 => none.
- TestPriorityCookieCase(cm.get(), "11HN 10MN 20LN 110MN 20LN 10HN", 20U,
- 109U, 21U, 150U, 0U);
- // Round 1 => none; round 2 => none; round 3 => 11L, 10M, 10H.
- TestPriorityCookieCase(cm.get(), "11LN 10MN 140HN 10MN 10LN", 10U, 10U,
- 130U, 150U, 0U);
- // Round 1 => none; round 2 => 1M; round 3 => 10L, 10M, 10H.
- TestPriorityCookieCase(cm.get(), "11MN 10HN 10LN 60MN 90HN", 0U, 60U, 90U,
+ // Round 1 => 10L; round 2 => 21M; round 3 => 0H.
+ TestPriorityCookieCase(cm.get(), "11HN 10MN 20LN 110MN 20LN 10HN", 30U, 99U,
+ 21U, 150U, 0U);
+ // Round 1 => none; round 2 => none; round 3 => 31H.
+ TestPriorityCookieCase(cm.get(), "11LN 10MN 140HN 10MN 10LN", 21U, 20U,
+ 109U, 150U, 0U);
+ // Round 1 => none; round 2 => 21M; round 3 => 10H.
+ TestPriorityCookieCase(cm.get(), "11MN 10HN 10LN 60MN 90HN", 10U, 50U, 90U,
150U, 0U);
- // Round 1 => none; round 2 => 10L, 21M; round 3 => none.
- TestPriorityCookieCase(cm.get(), "11MN 10HN 10LN 90MN 60HN", 0U, 80U, 70U,
+ // Round 1 => none; round 2 => 31M; round 3 => none.
+ TestPriorityCookieCase(cm.get(), "11MN 10HN 10LN 90MN 60HN", 10U, 70U, 70U,
150U, 0U);
- // TODO(jww): According to
- // https://tools.ietf.org/html/draft-west-cookie-priority#section-3, it
- // seems that quotas are a mechanism for preventing another application on
- // the same doman from DoS'ing an application by constantly evicting *all*
- // lower priority cookies.
- //
- // Unfortunately, this has never strictly worked in our implementation. Take
- // the following test as an example:
- // TestPriorityCookieCase(cm.get(), "50LN 131HN", 30U, 0U, 120U, 150U, 0U);
- //
- // According to this theory, we would expect eviction to proceed as:
// Round 1 => 20L; round 2 => 0; round 3 => 11H
- // thus resulting in 30L and 120H at the end.
- //
- // However, what happens in practice is that the cookies left are 19L and
- // 131H. This is because the quotas are accumulated over the rounds and what
- // priority they apply to is lost information. Since in the last round all
- // that is known is a total quota, and the low-priority cookies are least
- // recently accessed, they are evicted first to get down to 150 cookies.
- //
- // We should address this and uncomment the test below when it is fixed.
- //
- // See https://crbug.com/609550
- //
- // Round 1 => 20L; round 2 => 0; round 3 => 11H
- // TestPriorityCookieCase(cm.get(), "50LN 131HN", 30U, 0U, 120U, 150U, 0U);
+ TestPriorityCookieCase(cm.get(), "50LN 131HN", 30U, 0U, 120U, 150U, 0U);
// Round 1 => 20L; round 2 => 0; round 3 => 11H
TestPriorityCookieCase(cm.get(), "131HN 50LN", 30U, 0U, 120U, 150U, 0U);
// Round 1 => 20L; round 2 => none; round 3 => 11H.
@@ -643,8 +619,11 @@
// Each test case adds 181 cookies, so 31 cookies are evicted.
// Cookie same priority, repeated for each priority.
+ // Round 1 => 31L; round2 => none; round 3 => none.
TestPriorityCookieCase(cm.get(), "181LS", 150U, 0U, 0U, 0U, 150U);
+ // Round 1 => none; round2 => 31M; round 3 => none.
TestPriorityCookieCase(cm.get(), "181MS", 0U, 150U, 0U, 0U, 150U);
+ // Round 1 => none; round2 => none; round 3 => 31H.
TestPriorityCookieCase(cm.get(), "181HS", 0U, 0U, 150U, 0U, 150U);
// Pairwise scenarios.
@@ -652,15 +631,15 @@
TestPriorityCookieCase(cm.get(), "10HS 171MS", 0U, 140U, 10U, 0U, 150U);
// Round 1 => 10L; round2 => 21M; round 3 => none.
TestPriorityCookieCase(cm.get(), "141MS 40LS", 30U, 120U, 0U, 0U, 150U);
- // Round 1 => none; round2 => none; round 3 => 31H.
- TestPriorityCookieCase(cm.get(), "101HS 80MS", 0U, 80U, 70U, 0U, 150U);
+ // Round 1 => none; round2 => 30M; round 3 => 1H.
+ TestPriorityCookieCase(cm.get(), "101HS 80MS", 0U, 50U, 100U, 0U, 150U);
// For {low, medium} priorities right on quota, different orders.
- // Round 1 => 1L; round 2 => none, round3 => 30L.
- TestPriorityCookieCase(cm.get(), "31LS 50MS 100HS", 0U, 50U, 100U, 0U,
+ // Round 1 => 1L; round 2 => none, round3 => 30H.
+ TestPriorityCookieCase(cm.get(), "31LS 50MS 100HS", 30U, 50U, 70U, 0U,
150U);
- // Round 1 => none; round 2 => 1M, round3 => 30M.
- TestPriorityCookieCase(cm.get(), "51MS 100HS 30LS", 30U, 20U, 100U, 0U,
+ // Round 1 => none; round 2 => 1M, round3 => 30H.
+ TestPriorityCookieCase(cm.get(), "51MS 100HS 30LS", 30U, 50U, 70U, 0U,
150U);
// Round 1 => none; round 2 => none; round3 => 31H.
TestPriorityCookieCase(cm.get(), "101HS 50MS 30LS", 30U, 50U, 70U, 0U,
@@ -673,17 +652,17 @@
// Round 1 => 10L; round 2 => 10M; round 3 => 11H.
TestPriorityCookieCase(cm.get(), "21HS 60MS 40LS 60HS", 30U, 50U, 70U, 0U,
150U);
- // Round 1 => 10L; round 2 => 11M, 10L; round 3 => none.
- TestPriorityCookieCase(cm.get(), "11HS 10MS 20LS 110MS 20LS 10HS", 20U,
- 109U, 21U, 0U, 150U);
- // Round 1 => none; round 2 => none; round 3 => 11L, 10M, 10H.
- TestPriorityCookieCase(cm.get(), "11LS 10MS 140HS 10MS 10LS", 10U, 10U,
- 130U, 0U, 150U);
- // Round 1 => none; round 2 => 1M; round 3 => 10L, 10M, 10H.
- TestPriorityCookieCase(cm.get(), "11MS 10HS 10LS 60MS 90HS", 0U, 60U, 90U,
+ // Round 1 => 10L; round 2 => 21M; round 3 => none.
+ TestPriorityCookieCase(cm.get(), "11HS 10MS 20LS 110MS 20LS 10HS", 30U, 99U,
+ 21U, 0U, 150U);
+ // Round 1 => none; round 2 => none; round 3 => 31H.
+ TestPriorityCookieCase(cm.get(), "11LS 10MS 140HS 10MS 10LS", 21U, 20U,
+ 109U, 0U, 150U);
+ // Round 1 => none; round 2 => 21M; round 3 => 10H.
+ TestPriorityCookieCase(cm.get(), "11MS 10HS 10LS 60MS 90HS", 10U, 50U, 90U,
0U, 150U);
- // Round 1 => none; round 2 => 10L, 21M; round 3 => none.
- TestPriorityCookieCase(cm.get(), "11MS 10HS 10LS 90MS 60HS", 0U, 80U, 70U,
+ // Round 1 => none; round 2 => 31M; round 3 => none.
+ TestPriorityCookieCase(cm.get(), "11MS 10HS 10LS 90MS 60HS", 10U, 70U, 70U,
0U, 150U);
}
@@ -699,44 +678,101 @@
// secure cookies take priority, so the non-secure cookie is removed, along
// with 30 secure cookies. Repeated for each priority, and with the
// non-secure cookie as older and newer.
+ // Round 1 => 1LN; round 2 => 30LS; round 3 => none.
+ // Round 4 => none; round 5 => none; round 6 => none.
TestPriorityCookieCase(cm.get(), "1LN 180LS", 150U, 0U, 0U, 0U, 150U);
+ // Round 1 => none; round 2 => none; round 3 => 1MN.
+ // Round 4 => none; round 5 => 30MS; round 6 => none.
TestPriorityCookieCase(cm.get(), "1MN 180MS", 0U, 150U, 0U, 0U, 150U);
+ // Round 1 => none; round 2 => none; round 3 => none.
+ // Round 4 => 1HN; round 5 => none; round 6 => 30HS.
TestPriorityCookieCase(cm.get(), "1HN 180HS", 0U, 0U, 150U, 0U, 150U);
+ // Round 1 => 1LN; round 2 => 30LS; round 3 => none.
+ // Round 4 => none; round 5 => none; round 6 => none.
TestPriorityCookieCase(cm.get(), "180LS 1LN", 150U, 0U, 0U, 0U, 150U);
+ // Round 1 => none; round 2 => none; round 3 => 1MN.
+ // Round 4 => none; round 5 => 30MS; round 6 => none.
TestPriorityCookieCase(cm.get(), "180MS 1MN", 0U, 150U, 0U, 0U, 150U);
+ // Round 1 => none; round 2 => none; round 3 => none.
+ // Round 4 => 1HN; round 5 => none; round 6 => 30HS.
TestPriorityCookieCase(cm.get(), "180HS 1HN", 0U, 0U, 150U, 0U, 150U);
// Low-priority secure cookies are removed before higher priority non-secure
// cookies.
+ // Round 1 => none; round 2 => 31LS; round 3 => none.
+ // Round 4 => none; round 5 => none; round 6 => none.
TestPriorityCookieCase(cm.get(), "180LS 1MN", 149U, 1U, 0U, 1U, 149U);
+ // Round 1 => none; round 2 => 31LS; round 3 => none.
+ // Round 4 => none; round 5 => none; round 6 => none.
TestPriorityCookieCase(cm.get(), "180LS 1HN", 149U, 0U, 1U, 1U, 149U);
+ // Round 1 => none; round 2 => 31LS; round 3 => none.
+ // Round 4 => none; round 5 => none; round 6 => none.
TestPriorityCookieCase(cm.get(), "1MN 180LS", 149U, 1U, 0U, 1U, 149U);
+ // Round 1 => none; round 2 => 31LS; round 3 => none.
+ // Round 4 => none; round 5 => none; round 6 => none.
TestPriorityCookieCase(cm.get(), "1HN 180LS", 149U, 0U, 1U, 1U, 149U);
// Higher-priority non-secure cookies are removed before any secure cookie
- // with greater than low-priority.
- TestPriorityCookieCase(cm.get(), "180MS 1HN", 0U, 150U, 0U, 0U, 150U);
- TestPriorityCookieCase(cm.get(), "1HN 180MS", 0U, 150U, 0U, 0U, 150U);
+ // with greater than low-priority. Is it true? How about the quota?
+ // Round 1 => none; round 2 => none; round 3 => none.
+ // Round 4 => none; round 5 => 31MS; round 6 => none.
+ TestPriorityCookieCase(cm.get(), "180MS 1HN", 0U, 149U, 1U, 1U, 149U);
+ // Round 1 => none; round 2 => none; round 3 => none.
+ // Round 4 => none; round 5 => 31MS; round 6 => none.
+ TestPriorityCookieCase(cm.get(), "1HN 180MS", 0U, 149U, 1U, 1U, 149U);
// Pairwise:
+ // Round 1 => 31LN; round 2 => none; round 3 => none.
+ // Round 4 => none; round 5 => none; round 6 => none.
TestPriorityCookieCase(cm.get(), "1LS 180LN", 150U, 0U, 0U, 149U, 1U);
+ // Round 1 => 31LN; round 2 => none; round 3 => none.
+ // Round 4 => none; round 5 => none; round 6 => none.
TestPriorityCookieCase(cm.get(), "100LS 81LN", 150U, 0U, 0U, 50U, 100U);
+ // Round 1 => 31LN; round 2 => none; round 3 => none.
+ // Round 4 => none; round 5 => none; round 6 => none.
TestPriorityCookieCase(cm.get(), "150LS 31LN", 150U, 0U, 0U, 0U, 150U);
- TestPriorityCookieCase(cm.get(), "1LS 180HN", 0U, 0U, 150U, 150U, 0U);
+ // Round 1 => none; round 2 => none; round 3 => none.
+ // Round 4 => 31HN; round 5 => none; round 6 => none.
+ TestPriorityCookieCase(cm.get(), "1LS 180HN", 1U, 0U, 149U, 149U, 1U);
+ // Round 1 => none; round 2 => 31LS; round 3 => none.
+ // Round 4 => none; round 5 => none; round 6 => none.
TestPriorityCookieCase(cm.get(), "100LS 81HN", 69U, 0U, 81U, 81U, 69U);
+ // Round 1 => none; round 2 => 31LS; round 3 => none.
+ // Round 4 => none; round 5 => none; round 6 => none.
TestPriorityCookieCase(cm.get(), "150LS 31HN", 119U, 0U, 31U, 31U, 119U);
// Quota calculations inside non-secure/secure blocks remain in place:
- // Round 1 => 20LS; round 2 => none; round 3 => 11HN.
+ // Round 1 => none; round 2 => 20LS; round 3 => none.
+ // Round 4 => 11HN; round 5 => none; round 6 => none.
TestPriorityCookieCase(cm.get(), "50HN 50LS 81HS", 30U, 0U, 120U, 39U,
111U);
- // Round 1 => none; round 2 => 10LS, 21MN; round 3 => none.
- TestPriorityCookieCase(cm.get(), "11MS 10HN 10LS 90MN 60HN", 0U, 80U, 70U,
- 139U, 11U);
+ // Round 1 => none; round 2 => none; round 3 => 31MN.
+ // Round 4 => none; round 5 => none; round 6 => none.
+ TestPriorityCookieCase(cm.get(), "11MS 10HN 10LS 90MN 60HN", 10U, 70U, 70U,
+ 129U, 21U);
+ // Round 1 => 31LN; round 2 => none; round 3 => none.
+ // Round 4 => none; round 5 => none; round 6 => none.
+ TestPriorityCookieCase(cm.get(), "40LS 40LN 101HS", 49U, 0U, 101U, 9U,
+ 141U);
// Multiple GC rounds end up with consistent behavior:
- TestPriorityCookieCase(cm.get(), "100HS 100LN 100MN", 0, 76U, 100U, 76U,
- 100U);
+ // GC is started as soon as there are 181 cookies in the store.
+ // On each major round it tries to preserve the quota for each priority.
+ // It is not aware about more cookies going in.
+ // 1 GC notices there are 181 cookies - 100HS 81LN 0MN
+ // Round 1 => 31LN; round 2 => none; round 3 => none.
+ // Round 4 => none; round 5 => none; round 6 => none.
+ // 2 GC notices there are 181 cookies - 100HS 69LN 12MN
+ // Round 1 => 31LN; round 2 => none; round 3 => none.
+ // Round 4 => none; round 5 => none; round 6 => none.
+ // 3 GC notices there are 181 cookies - 100HS 38LN 43MN
+ // Round 1 => 8LN; round 2 => none; round 3 => none.
+ // Round 4 => none; round 5 => none; round 6 => 23HS.
+ // 4 GC notcies there are 181 cookies - 77HS 30LN 74MN
+ // Round 1 => none; round 2 => none; round 3 => 24MN.
+ // Round 4 => none; round 5 => none; round 6 => 7HS.
+ TestPriorityCookieCase(cm.get(), "100HS 100LN 100MN", 30U, 76U, 70U, 106U,
+ 70U);
}
// Function for creating a CM with a number of cookies in it,
