-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright 2010 The Chromium Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include <ostream>
#include <utility>
+#include "base/check_op.h"
#include "base/logging.h"
-#include "base/macros.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
namespace logging {
const int VlogInfo::kDefaultVlogLevel = 0;
-struct VlogInfo::VmodulePattern {
- enum MatchTarget { MATCH_MODULE, MATCH_FILE };
-
- explicit VmodulePattern(const std::string& pattern);
-
- VmodulePattern();
-
- std::string pattern;
- int vlog_level;
- MatchTarget match_target;
-};
-
VlogInfo::VmodulePattern::VmodulePattern(const std::string& pattern)
: pattern(pattern),
vlog_level(VlogInfo::kDefaultVlogLevel),
}
VlogInfo::VmodulePattern::VmodulePattern()
- : vlog_level(VlogInfo::kDefaultVlogLevel),
- match_target(MATCH_MODULE) {}
+ : vlog_level(VlogInfo::kDefaultVlogLevel), match_target(MATCH_MODULE) {}
+
+// static
+std::vector<VlogInfo::VmodulePattern> VlogInfo::ParseVmoduleLevels(
+ const std::string& vmodule_switch) {
+ std::vector<VmodulePattern> vmodule_levels;
+ base::StringPairs kv_pairs;
+ if (!base::SplitStringIntoKeyValuePairs(vmodule_switch, '=', ',',
+ &kv_pairs)) {
+ DLOG(WARNING) << "Could not fully parse vmodule switch \"" << vmodule_switch
+ << "\"";
+ }
+ for (const auto& pair : kv_pairs) {
+ VmodulePattern pattern(pair.first);
+ if (!base::StringToInt(pair.second, &pattern.vlog_level)) {
+ DLOG(WARNING) << "Parsed vlog level for \"" << pair.first << "="
+ << pair.second << "\" as " << pattern.vlog_level;
+ }
+ vmodule_levels.push_back(pattern);
+ }
+ return vmodule_levels;
+}
VlogInfo::VlogInfo(const std::string& v_switch,
const std::string& vmodule_switch,
int* min_log_level)
- : min_log_level_(min_log_level) {
+ : vmodule_levels_(ParseVmoduleLevels(vmodule_switch)),
+ min_log_level_(min_log_level) {
DCHECK_NE(min_log_level, nullptr);
int vlog_level = 0;
DLOG(WARNING) << "Could not parse v switch \"" << v_switch << "\"";
}
}
-
- base::StringPairs kv_pairs;
- if (!base::SplitStringIntoKeyValuePairs(
- vmodule_switch, '=', ',', &kv_pairs)) {
- DLOG(WARNING) << "Could not fully parse vmodule switch \""
- << vmodule_switch << "\"";
- }
- for (base::StringPairs::const_iterator it = kv_pairs.begin();
- it != kv_pairs.end(); ++it) {
- VmodulePattern pattern(it->first);
- if (!base::StringToInt(it->second, &pattern.vlog_level)) {
- DLOG(WARNING) << "Parsed vlog level for \""
- << it->first << "=" << it->second
- << "\" as " << pattern.vlog_level;
- }
- vmodule_levels_.push_back(pattern);
- }
}
VlogInfo::~VlogInfo() = default;
// Given a path, returns the basename with the extension chopped off
// (and any -inl suffix). We avoid using FilePath to minimize the
// number of dependencies the logging system has.
-base::StringPiece GetModule(const base::StringPiece& file) {
+base::StringPiece GetModule(base::StringPiece file) {
base::StringPiece module(file);
- base::StringPiece::size_type last_slash_pos =
- module.find_last_of("\\/");
+ base::StringPiece::size_type last_slash_pos = module.find_last_of("\\/");
if (last_slash_pos != base::StringPiece::npos)
module.remove_prefix(last_slash_pos + 1);
base::StringPiece::size_type extension_start = module.rfind('.');
module = module.substr(0, extension_start);
static const char kInlSuffix[] = "-inl";
- static const int kInlSuffixLen = arraysize(kInlSuffix) - 1;
- if (module.ends_with(kInlSuffix))
+ static const int kInlSuffixLen = std::size(kInlSuffix) - 1;
+ if (base::EndsWith(module, kInlSuffix))
module.remove_suffix(kInlSuffixLen);
return module;
}
} // namespace
-int VlogInfo::GetVlogLevel(const base::StringPiece& file) const {
+int VlogInfo::GetVlogLevel(base::StringPiece file) const {
if (!vmodule_levels_.empty()) {
base::StringPiece module(GetModule(file));
- for (auto it = vmodule_levels_.begin(); it != vmodule_levels_.end(); ++it) {
+ for (const auto& it : vmodule_levels_) {
base::StringPiece target(
- (it->match_target == VmodulePattern::MATCH_FILE) ? file : module);
- if (MatchVlogPattern(target, it->pattern))
- return it->vlog_level;
+ (it.match_target == VmodulePattern::MATCH_FILE) ? file : module);
+ if (MatchVlogPattern(target, it.pattern))
+ return it.vlog_level;
}
}
return GetMaxVlogLevel();
return -*min_log_level_;
}
-bool MatchVlogPattern(const base::StringPiece& string,
- const base::StringPiece& vlog_pattern) {
- base::StringPiece p(vlog_pattern);
- base::StringPiece s(string);
- // Consume characters until the next star.
- while (!p.empty() && !s.empty() && (p[0] != '*')) {
- switch (p[0]) {
- // A slash (forward or back) must match a slash (forward or back).
- case '/':
- case '\\':
- if ((s[0] != '/') && (s[0] != '\\'))
- return false;
- break;
-
- // A '?' matches anything.
- case '?':
- break;
-
- // Anything else must match literally.
- default:
- if (p[0] != s[0])
- return false;
- break;
- }
- p.remove_prefix(1), s.remove_prefix(1);
- }
+VlogInfo::VlogInfo(std::vector<VmodulePattern> vmodule_levels,
+ int* min_log_level)
+ : vmodule_levels_(std::move(vmodule_levels)),
+ min_log_level_(min_log_level) {}
+
+VlogInfo* VlogInfo::WithSwitches(const std::string& vmodule_switch) const {
+ std::vector<VmodulePattern> vmodule_levels = vmodule_levels_;
+ std::vector<VmodulePattern> additional_vmodule_levels =
+ ParseVmoduleLevels(vmodule_switch);
+ vmodule_levels.insert(vmodule_levels.end(), additional_vmodule_levels.begin(),
+ additional_vmodule_levels.end());
+ return new VlogInfo(std::move(vmodule_levels), min_log_level_);
+}
- // An empty pattern here matches only an empty string.
- if (p.empty())
- return s.empty();
-
- // Coalesce runs of consecutive stars. There should be at least
- // one.
- while (!p.empty() && (p[0] == '*'))
- p.remove_prefix(1);
-
- // Since we moved past the stars, an empty pattern here matches
- // anything.
- if (p.empty())
- return true;
-
- // Since we moved past the stars and p is non-empty, if some
- // non-empty substring of s matches p, then we ourselves match.
- while (!s.empty()) {
- if (MatchVlogPattern(s, p))
- return true;
- s.remove_prefix(1);
+bool MatchVlogPattern(base::StringPiece string,
+ base::StringPiece vlog_pattern) {
+ // The code implements the glob matching using a greedy approach described in
+ // https://research.swtch.com/glob.
+ size_t s = 0, nexts = 0;
+ size_t p = 0, nextp = 0;
+ size_t slen = string.size(), plen = vlog_pattern.size();
+ while (s < slen || p < plen) {
+ if (p < plen) {
+ switch (vlog_pattern[p]) {
+ // A slash (forward or back) must match a slash (forward or back).
+ case '/':
+ case '\\':
+ if (s < slen && (string[s] == '/' || string[s] == '\\')) {
+ p++, s++;
+ continue;
+ }
+ break;
+ // A '?' matches anything.
+ case '?':
+ if (s < slen) {
+ p++, s++;
+ continue;
+ }
+ break;
+ case '*':
+ nextp = p;
+ nexts = s + 1;
+ p++;
+ continue;
+ // Anything else must match literally.
+ default:
+ if (s < slen && string[s] == vlog_pattern[p]) {
+ p++, s++;
+ continue;
+ }
+ break;
+ }
+ }
+ // Mismatch - maybe restart.
+ if (0 < nexts && nexts <= slen) {
+ p = nextp;
+ s = nexts;
+ continue;
+ }
+ return false;
}
-
- // Otherwise, we couldn't find a match.
- return false;
+ return true;
}
} // namespace logging
projects / platform / framework / web / chromium-efl.git / blobdiff