Store field trial parameters in shared memory

base/metrics/field_trial.cc

 // Copyright (c) 2012 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.
 
 #include "base/metrics/field_trial.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/base_switches.h"
 #include "base/build_time.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/logging.h"
+#include "base/metrics/field_trial_param_associator.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/pickle.h"
 #include "base/process/memory.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 
 namespace base {
@@ skipping 19 matching lines @@
 const char kAllocatorName[] = "FieldTrialAllocator";
 const uint32_t kFieldTrialType = 0xABA17E13 + 1;  // SHA1(FieldTrialEntry) v1
 #if !defined(OS_NACL)
 const size_t kFieldTrialAllocationSize = 4 << 10;  // 4 KiB = one page
 #endif
 
 // We create one FieldTrialEntry per field trial in shared memory, via
 // AddToAllocatorWhileLocked. The FieldTrialEntry is followed by a base::Pickle
 // object that we unpickle and read from.
 struct FieldTrialEntry {
   bool activated;

[Alexei Svitkine (slow), 2016/11/01 14:57:16]

Hmm, I thought I left a comment on your previous CL to add a comment above this
member.

Looking at that CL, yes I did here:

"Nit: Remove "It contains whether or not it's activated." and instead put a
comment above the member."

https://codereview.chromium.org/2449783007#msg13

Can you do it in this CL?

[lawrencewu, 2016/11/01 18:29:05]

Oops, I must have missed that. Done.

 
   // Size of the pickled structure, NOT the total size of this entry.
   uint32_t size;

[Alexei Svitkine (slow), 2016/11/01 14:57:16]

Add a blank line below this and a comment about the function.

[lawrencewu, 2016/11/01 18:29:05]

Done.

+  PickleIterator GetPickleIterator() const {
+    char* src = reinterpret_cast<char*>(const_cast<FieldTrialEntry*>(this)) +
+                sizeof(FieldTrialEntry);
+
+    Pickle pickle(src, size);
+    return PickleIterator(pickle);
+  }
 
   // Calling this is only valid when the entry is initialized. That is, it
   // resides in shared memory and has a pickle containing the trial name and
   // group name following it.
   bool GetTrialAndGroupName(StringPiece* trial_name,
                             StringPiece* group_name) const {
-    char* src = reinterpret_cast<char*>(const_cast<FieldTrialEntry*>(this)) +
-                sizeof(FieldTrialEntry);
-
-    Pickle pickle(src, size);
-    PickleIterator pickle_iter(pickle);
-
-    if (!pickle_iter.ReadStringPiece(trial_name))
+    PickleIterator iter = GetPickleIterator();
+    if (!iter.ReadStringPiece(trial_name))
       return false;
-    if (!pickle_iter.ReadStringPiece(group_name))
+    if (!iter.ReadStringPiece(group_name))
       return false;
     return true;
   }
 };
 
 // Created a time value based on |year|, |month| and |day_of_month| parameters.
 Time CreateTimeFromParams(int year, int month, int day_of_month) {
   DCHECK_GT(year, 1970);
   DCHECK_GT(month, 0);
   DCHECK_LT(month, 13);
@@ skipping 91 matching lines @@
   HANDLE src = allocator->shared_memory()->handle().GetHandle();
   ProcessHandle process = GetCurrentProcess();
   DWORD access = SECTION_MAP_READ | SECTION_QUERY;
   HANDLE dst;
   if (!::DuplicateHandle(process, src, process, &dst, access, true, 0))
     return nullptr;
   return dst;
 }
 #endif
 
+bool PickleFieldTrialState(const FieldTrial::State& trial_state,
+                           Pickle* pickle) {
+  pickle->WriteString(trial_state.trial_name);
+  pickle->WriteString(trial_state.group_name);
+
+  std::map<std::string, std::string> params;
+  if (!FieldTrialParamAssociator::GetInstance()->GetFieldTrialParamsWhileLocked(
+          trial_state.trial_name.as_string(),
+          trial_state.group_name.as_string(), &params))

[Alexei Svitkine (slow), 2016/11/01 14:57:16]

Nit: {}'s

[lawrencewu, 2016/11/01 18:29:05]

Done.

+    return false;
+
+  for (const auto& param : params) {
+    pickle->WriteString(StringPiece(param.first));
+    pickle->WriteString(StringPiece(param.second));

[Alexei Svitkine (slow), 2016/11/01 14:57:16]

Can you also add the changes to actually read from these to
FieldTrialParamAssociator?

I'd rather have both parts be in the same CL.

[lawrencewu, 2016/11/01 18:29:05]

Done.

+  }
+  return true;
+}
+
 }  // namespace
 
 // statics
 const int FieldTrial::kNotFinalized = -1;
 const int FieldTrial::kDefaultGroupNumber = 0;
 bool FieldTrial::enable_benchmarking_ = false;
 
 int FieldTrialList::kNoExpirationYear = 0;
 
 //------------------------------------------------------------------------------
@@ skipping 703 matching lines @@
 
   // Or if we've already added it.
   if (field_trial->ref_ != SharedPersistentMemoryAllocator::kReferenceNull)
     return;
 
   FieldTrial::State trial_state;
   if (!field_trial->GetState(&trial_state))
     return;
 
   Pickle pickle;
-  pickle.WriteString(trial_state.trial_name);
-  pickle.WriteString(trial_state.group_name);
+  if (!PickleFieldTrialState(trial_state, &pickle))
+    return;
 
   size_t total_size = sizeof(FieldTrialEntry) + pickle.size();
   SharedPersistentMemoryAllocator::Reference ref =
       allocator->Allocate(total_size, kFieldTrialType);
   if (ref == SharedPersistentMemoryAllocator::kReferenceNull)
     return;
 
   FieldTrialEntry* entry =
       allocator->GetAsObject<FieldTrialEntry>(ref, kFieldTrialType);
   entry->activated = trial_state.activated;
@@ skipping 53 matching lines @@
     return;
   }
   AutoLock auto_lock(global_->lock_);
   CHECK(!global_->PreLockedFind(trial->trial_name())) << trial->trial_name();
   trial->AddRef();
   trial->SetTrialRegistered();
   global_->registered_[trial->trial_name()] = trial;
 }
 
 }  // namespace base