Chromium Code Reviews| Index: base/metrics/field_trial.cc |
| diff --git a/base/metrics/field_trial.cc b/base/metrics/field_trial.cc |
| index c1416dbce2e80a61bc188104c49780c82b9b57c2..5a2ce0082a11bfc9898f55213a3c813ecaacb129 100644 |
| --- a/base/metrics/field_trial.cc |
| +++ b/base/metrics/field_trial.cc |
| @@ -1,4 +1,4 @@ |
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| +// Copyright (c) 2011 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. |
| @@ -6,6 +6,8 @@ |
| #include "base/logging.h" |
| #include "base/rand_util.h" |
| +#include "base/sha1.h" |
| +#include "base/string_util.h" |
| #include "base/stringprintf.h" |
| #include "base/utf_string_conversions.h" |
| @@ -37,10 +39,11 @@ FieldTrial::FieldTrial(const std::string& name, |
| : name_(name), |
| divisor_(total_probability), |
| default_group_name_(default_group_name), |
| - random_(static_cast<Probability>(divisor_ * base::RandDouble())), |
| + random_(static_cast<Probability>(divisor_ * RandDouble())), |
| accumulated_group_probability_(0), |
| next_group_number_(kDefaultGroupNumber+1), |
| - group_(kNotFinalized) { |
| + group_(kNotFinalized), |
| + enable_field_trial_(true) { |
| DCHECK_GT(total_probability, 0); |
| DCHECK(!default_group_name_.empty()); |
| FieldTrialList::Register(this); |
| @@ -51,7 +54,7 @@ FieldTrial::FieldTrial(const std::string& name, |
| DCHECK_GT(day_of_month, 0); |
| DCHECK_LT(day_of_month, 32); |
| - base::Time::Exploded exploded; |
| + Time::Exploded exploded; |
| exploded.year = year; |
| exploded.month = month; |
| exploded.day_of_week = 0; // Should be unused. |
| @@ -61,8 +64,32 @@ FieldTrial::FieldTrial(const std::string& name, |
| exploded.second = 0; |
| exploded.millisecond = 0; |
| - base::Time expiration_time = Time::FromLocalExploded(exploded); |
| - disable_field_trial_ = (GetBuildTime() > expiration_time) ? true : false; |
| + Time expiration_time = Time::FromLocalExploded(exploded); |
| + if (GetBuildTime() > expiration_time) |
| + Disable(); |
| +} |
| + |
| +void FieldTrial::UseOneTimeRandomization() { |
| + DCHECK_EQ(group_, kNotFinalized); |
| + if (!FieldTrialList::IsOneTimeRandomizationEnabled()) { |
| + NOTREACHED(); |
| + Disable(); |
| + return; |
| + } |
| + |
| + random_ = static_cast<Probability>( |
| + divisor_ * HashClientId(FieldTrialList::client_id(), name_)); |
| +} |
| + |
| +void FieldTrial::Disable() { |
| + enable_field_trial_ = false; |
| + |
| + // In case we are disabled after initialization, we need to switch |
| + // the trial to the default group. |
| + if (group_ != kNotFinalized) { |
| + group_ = kDefaultGroupNumber; |
| + group_name_ = default_group_name_; |
| + } |
| } |
| int FieldTrial::AppendGroup(const std::string& name, |
| @@ -70,7 +97,7 @@ int FieldTrial::AppendGroup(const std::string& name, |
| DCHECK(group_probability <= divisor_); |
| DCHECK_GE(group_probability, 0); |
| - if (enable_benchmarking_ || disable_field_trial_) |
| + if (enable_benchmarking_ || !enable_field_trial_) |
| group_probability = 0; |
| accumulated_group_probability_ += group_probability; |
| @@ -80,7 +107,7 @@ int FieldTrial::AppendGroup(const std::string& name, |
| // This is the group that crossed the random line, so we do the assignment. |
| group_ = next_group_number_; |
| if (name.empty()) |
| - base::StringAppendF(&group_name_, "%d", group_); |
| + StringAppendF(&group_name_, "%d", group_); |
| else |
| group_name_ = name; |
| } |
| @@ -98,6 +125,7 @@ int FieldTrial::group() { |
| std::string FieldTrial::group_name() { |
| group(); // call group() to make group assignment was done. |
| + DCHECK(!group_name_.empty()); |
| return group_name_; |
| } |
| @@ -127,6 +155,25 @@ Time FieldTrial::GetBuildTime() { |
| return integral_build_time; |
| } |
| +// static |
| +double FieldTrial::HashClientId(const std::string& client_id, |
| + const std::string& trial_name) { |
| + // SHA-1 is designed to produce a uniformly random spread in its output space, |
| + // even for nearly-identical inputs, so it helps massage whatever client_id |
| + // and trial_name we get into something with a uniform distribution, which |
| + // is desirable so that we don't skew any part of the 0-100% spectrum. |
| + std::string input(client_id + trial_name); |
| + unsigned char sha1_hash[SHA1_LENGTH]; |
| + SHA1HashBytes(reinterpret_cast<const unsigned char*>(input.c_str()), |
| + input.size(), |
| + sha1_hash); |
| + |
| + COMPILE_ASSERT(sizeof(uint64) < sizeof(sha1_hash), need_more_data); |
| + uint64* bits = reinterpret_cast<uint64*>(&sha1_hash[0]); |
| + |
| + return BitsToRandLikeDouble(*bits); |
| +} |
| + |
| //------------------------------------------------------------------------------ |
| // FieldTrialList methods and members. |
| @@ -263,6 +310,36 @@ size_t FieldTrialList::GetFieldTrialCount() { |
| return global_->registered_.size(); |
| } |
| +// static |
| +void FieldTrialList::EnableOneTimeRandomization(const std::string& client_id) { |
| + DCHECK(global_); |
| + if (!global_) |
| + return; |
| + |
| + DCHECK(!global_->IsOneTimeRandomizationEnabled()); |
| + DCHECK(!client_id.empty()); |
| + |
| + global_->client_id_ = client_id; |
| +} |
| + |
| +// static |
| +bool FieldTrialList::IsOneTimeRandomizationEnabled() { |
| + DCHECK(global_); |
| + if (!global_) |
| + return false; |
| + |
| + return !global_->client_id_.empty(); |
| +} |
| + |
| +// static |
| +const std::string& FieldTrialList::client_id() { |
| + DCHECK(global_); |
| + if (!global_) |
| + return EmptyString(); |
|
jar (doing other things)
2011/04/21 22:10:02
If you switch over to using a detectable uninitial
jar (doing other things)
2011/04/29 00:57:11
In fact.... I'd argument that the EmptyString() wo
|
| + |
| + return global_->client_id_; |
| +} |
| + |
| FieldTrial* FieldTrialList::PreLockedFind(const std::string& name) { |
| RegistrationList::iterator it = registered_.find(name); |
| if (registered_.end() == it) |