admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Relax FieldTrials construction parameter to string_view

Browse Source 
Bug: webrtc:42223790
Change-Id: I8ae85a9870aee86f021249a2652555f9c882b338
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/374162
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43732}
This commit is contained in:
Danil Chapovalov 2025-01-13 19:21:50 +01:00 committed by WebRTC LUCI CQ
parent 11edd41c04
commit 63b914d178
2 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
api/field_trials.cc
View File

@ -22,38 +22,30 @@
namespace {
// This part is copied from system_wrappers/field_trial.cc.
webrtc::flat_map<std::string, std::string> InsertIntoMap(const std::string& s) {
std::string::size_type field_start = 0;
webrtc::flat_map<std::string, std::string> InsertIntoMap(absl::string_view s) {
webrtc::flat_map<std::string, std::string> key_value_map;
while (field_start < s.size()) {
std::string::size_type separator_pos = s.find('/', field_start);
RTC_CHECK_NE(separator_pos, std::string::npos)
while (!s.empty()) {
absl::string_view::size_type separator_pos = s.find('/');
RTC_CHECK_NE(separator_pos, absl::string_view::npos)
<< "Missing separator '/' after field trial key.";
RTC_CHECK_GT(separator_pos, field_start)
<< "Field trial key cannot be empty.";
std::string key = s.substr(field_start, separator_pos - field_start);
field_start = separator_pos + 1;
RTC_CHECK_GT(separator_pos, 0) << "Field trial key cannot be empty.";
absl::string_view key = s.substr(0, separator_pos);
s.remove_prefix(separator_pos + 1);
RTC_CHECK_LT(field_start, s.size())
RTC_CHECK(!s.empty())
<< "Missing value after field trial key. String ended.";
separator_pos = s.find('/', field_start);
RTC_CHECK_NE(separator_pos, std::string::npos)
separator_pos = s.find('/');
RTC_CHECK_NE(separator_pos, absl::string_view::npos)
<< "Missing terminating '/' in field trial string.";
RTC_CHECK_GT(separator_pos, field_start)
<< "Field trial value cannot be empty.";
std::string value = s.substr(field_start, separator_pos - field_start);
field_start = separator_pos + 1;
RTC_CHECK_GT(separator_pos, 0) << "Field trial value cannot be empty.";
absl::string_view value = s.substr(0, separator_pos);
s.remove_prefix(separator_pos + 1);
// If a key is specified multiple times, only the value linked to the first
// key is stored. note: This will crash in debug build when calling
// InitFieldTrialsFromString().
key_value_map.emplace(key, value);
}
// This check is technically redundant due to earlier checks.
// We nevertheless keep the check to make it clear that the entire
// string has been processed, and without indexing past the end.
RTC_CHECK_EQ(field_start, s.size());
return key_value_map;
}
@ -67,7 +59,7 @@ std::atomic<bool> instance_created_{false};
namespace webrtc {
FieldTrials::FieldTrials(const std::string& s)
FieldTrials::FieldTrials(absl::string_view s)
: uses_global_(true),
field_trial_string_(s),
previous_field_trial_string_(webrtc::field_trial::GetFieldTrialString()),
@ -78,11 +70,11 @@ FieldTrials::FieldTrials(const std::string& s)
<< "Only one instance may be instanciated at any given time!";
}
std::unique_ptr<FieldTrials> FieldTrials::CreateNoGlobal(const std::string& s) {
std::unique_ptr<FieldTrials> FieldTrials::CreateNoGlobal(absl::string_view s) {
return std::unique_ptr<FieldTrials>(new FieldTrials(s, true));
}
FieldTrials::FieldTrials(const std::string& s, bool)
FieldTrials::FieldTrials(absl::string_view s, bool)
: uses_global_(false),
previous_field_trial_string_(nullptr),
key_value_map_(InsertIntoMap(s)) {}
@ -96,7 +88,7 @@ FieldTrials::~FieldTrials() {
}
std::string FieldTrials::GetValue(absl::string_view key) const {
auto it = key_value_map_.find(std::string(key));
auto it = key_value_map_.find(key);
if (it != key_value_map_.end())
return it->second;
@ -104,7 +96,7 @@ std::string FieldTrials::GetValue(absl::string_view key) const {
// a mix between FieldTrials and the global string continue to work
// TODO(bugs.webrtc.org/10335): Remove the global string!
if (uses_global_) {
return field_trial::FindFullName(std::string(key));
return field_trial::FindFullName(key);
}
return "";
}

6
api/field_trials.h
View File

@ -36,15 +36,15 @@ namespace webrtc {
// (unless using CreateNoGlobal):
class FieldTrials : public FieldTrialsRegistry {
public:
explicit FieldTrials(const std::string& s);
explicit FieldTrials(absl::string_view s);
~FieldTrials();
// Create a FieldTrials object that is not reading/writing from
// global variable (i.e can not be used for all parts of webrtc).
static std::unique_ptr<FieldTrials> CreateNoGlobal(const std::string& s);
static std::unique_ptr<FieldTrials> CreateNoGlobal(absl::string_view s);
private:
explicit FieldTrials(const std::string& s, bool);
explicit FieldTrials(absl::string_view s, bool);
std::string GetValue(absl::string_view key) const override;