diff options
author | Hector Dearman <hjd@google.com> | 2020-09-09 18:23:06 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-09 18:23:06 +0000 |
commit | 5c04be89da8bd8aca25e5503b1609f30e06f1bd9 (patch) | |
tree | cbcf37322623a764a9ad4ce624421e45f59f06c0 | |
parent | e33ebfc6c7782b4bf8ee90080b72b213c62ad99a (diff) | |
parent | eedd5bcc37d48d4e4b56e040353f19e87e2e7683 (diff) | |
download | perfetto-temp_sam_168057903.tar.gz |
Merge "Replace size() == 0 with empty()" am: eedd5bcc37temp_sam_168057903
Original change: https://android-review.googlesource.com/c/platform/external/perfetto/+/1421509
Change-Id: I4c7f5fd653cd2b251c2dbd4775ac02bdd2490daa
-rw-r--r-- | src/base/string_utils.cc | 2 | ||||
-rw-r--r-- | src/perfetto_cmd/rate_limiter.cc | 2 | ||||
-rw-r--r-- | src/perfetto_cmd/trigger_perfetto.cc | 2 | ||||
-rw-r--r-- | src/profiling/deobfuscator.cc | 2 | ||||
-rw-r--r-- | src/trace_processor/importers/common/slice_tracker.cc | 2 | ||||
-rw-r--r-- | src/trace_processor/importers/memory_tracker/graph_processor.cc | 2 | ||||
-rw-r--r-- | src/trace_processor/importers/proto/stack_profile_tracker.cc | 2 | ||||
-rw-r--r-- | src/trace_processor/importers/systrace/systrace_parser.h | 2 | ||||
-rw-r--r-- | src/trace_processor/metrics/metrics.cc | 2 | ||||
-rw-r--r-- | src/trace_processor/rpc/query_result_serializer_unittest.cc | 2 | ||||
-rw-r--r-- | src/trace_processor/storage/trace_storage.h | 2 | ||||
-rw-r--r-- | src/traced/probes/ftrace/ftrace_procfs.cc | 2 | ||||
-rw-r--r-- | src/traced/probes/power/android_power_data_source.cc | 2 |
13 files changed, 13 insertions, 13 deletions
diff --git a/src/base/string_utils.cc b/src/base/string_utils.cc index af7377cd1..9a23b75b2 100644 --- a/src/base/string_utils.cc +++ b/src/base/string_utils.cc @@ -40,7 +40,7 @@ bool Contains(const std::string& haystack, const std::string& needle) { } size_t Find(const StringView& needle, const StringView& haystack) { - if (needle.size() == 0) + if (needle.empty()) return 0; if (needle.size() > haystack.size()) return std::string::npos; diff --git a/src/perfetto_cmd/rate_limiter.cc b/src/perfetto_cmd/rate_limiter.cc index daa440397..4567db885 100644 --- a/src/perfetto_cmd/rate_limiter.cc +++ b/src/perfetto_cmd/rate_limiter.cc @@ -207,7 +207,7 @@ bool RateLimiter::LoadState(gen::PerfettoCmdState* state) { return false; std::string s; base::ReadFileDescriptor(in_fd.get(), &s); - if (s.size() == 0) + if (s.empty()) return false; return state->ParseFromString(s); } diff --git a/src/perfetto_cmd/trigger_perfetto.cc b/src/perfetto_cmd/trigger_perfetto.cc index cd22ea2a7..e004c1e30 100644 --- a/src/perfetto_cmd/trigger_perfetto.cc +++ b/src/perfetto_cmd/trigger_perfetto.cc @@ -60,7 +60,7 @@ TriggerPerfettoMain(int argc, char** argv) { for (int i = optind; i < argc; i++) triggers_to_activate.push_back(std::string(argv[i])); - if (triggers_to_activate.size() == 0) { + if (triggers_to_activate.empty()) { PERFETTO_ELOG("At least one trigger must the specified."); return PrintUsage(argv[0]); } diff --git a/src/profiling/deobfuscator.cc b/src/profiling/deobfuscator.cc index 0038b739c..cea630a18 100644 --- a/src/profiling/deobfuscator.cc +++ b/src/profiling/deobfuscator.cc @@ -48,7 +48,7 @@ base::Optional<ProguardClass> ParseClass(std::string line) { return base::nullopt; } std::string obfuscated_name(ss.cur_token(), ss.cur_token_size()); - if (obfuscated_name.size() == 0) { + if (obfuscated_name.empty()) { PERFETTO_ELOG("Empty obfuscated name."); return base::nullopt; } diff --git a/src/trace_processor/importers/common/slice_tracker.cc b/src/trace_processor/importers/common/slice_tracker.cc index dd5cffc36..a1082d230 100644 --- a/src/trace_processor/importers/common/slice_tracker.cc +++ b/src/trace_processor/importers/common/slice_tracker.cc @@ -214,7 +214,7 @@ base::Optional<uint32_t> SliceTracker::StartSlice( // If this is an unnestable track, don't start a new slice if one already // exists. - if (stack->size() != 0) { + if (!stack->empty()) { return base::nullopt; } } diff --git a/src/trace_processor/importers/memory_tracker/graph_processor.cc b/src/trace_processor/importers/memory_tracker/graph_processor.cc index c97dc195d..3ab41ea91 100644 --- a/src/trace_processor/importers/memory_tracker/graph_processor.cc +++ b/src/trace_processor/importers/memory_tracker/graph_processor.cc @@ -537,7 +537,7 @@ base::Optional<uint64_t> GraphProcessor::AggregateSizeForDescendantNode( if (owns_edge && owns_edge->target()->IsDescendentOf(*root)) return base::make_optional(0UL); - if (descendant->children()->size() == 0) + if (descendant->children()->empty()) return GetSizeEntryOfNode(descendant).value_or(0ul); base::Optional<uint64_t> size; diff --git a/src/trace_processor/importers/proto/stack_profile_tracker.cc b/src/trace_processor/importers/proto/stack_profile_tracker.cc index edd45c55a..df44c3bf5 100644 --- a/src/trace_processor/importers/proto/stack_profile_tracker.cc +++ b/src/trace_processor/importers/proto/stack_profile_tracker.cc @@ -207,7 +207,7 @@ base::Optional<CallsiteId> SequenceStackProfileTracker::AddCallstack( SourceCallstackId id, const SourceCallstack& frame_ids, const InternLookup* intern_lookup) { - if (frame_ids.size() == 0) + if (frame_ids.empty()) return base::nullopt; base::Optional<CallsiteId> parent_id; diff --git a/src/trace_processor/importers/systrace/systrace_parser.h b/src/trace_processor/importers/systrace/systrace_parser.h index ae5eec6da..bc098fd70 100644 --- a/src/trace_processor/importers/systrace/systrace_parser.h +++ b/src/trace_processor/importers/systrace/systrace_parser.h @@ -155,7 +155,7 @@ inline SystraceParseResult ParseSystraceTracePoint(base::StringView str, size_t name_index = 2 + tgid_length + 1; out->name = base::StringView( s + name_index, len - name_index - (s[len - 1] == '\n' ? 1 : 0)); - if (out->name.size() == 0) + if (out->name.empty()) return SystraceParseResult::kFailure; return SystraceParseResult::kSuccess; } diff --git a/src/trace_processor/metrics/metrics.cc b/src/trace_processor/metrics/metrics.cc index 99e243a89..dfd5df63b 100644 --- a/src/trace_processor/metrics/metrics.cc +++ b/src/trace_processor/metrics/metrics.cc @@ -542,7 +542,7 @@ void BuildProto(sqlite3_context* ctx, int argc, sqlite3_value** argv) { // Even if the message is empty, we don't return null here as we want the // existence of the message to be respected. std::vector<uint8_t> raw = builder.SerializeToProtoBuilderResult(); - if (raw.size() == 0) { + if (raw.empty()) { // Passing nullptr to SQLite feels dangerous so just pass an empty string // and zero as the size so we don't deref nullptr accidentially somewhere. sqlite3_result_blob(ctx, "", 0, nullptr); diff --git a/src/trace_processor/rpc/query_result_serializer_unittest.cc b/src/trace_processor/rpc/query_result_serializer_unittest.cc index e537c99a2..a5e0c6877 100644 --- a/src/trace_processor/rpc/query_result_serializer_unittest.cc +++ b/src/trace_processor/rpc/query_result_serializer_unittest.cc @@ -185,7 +185,7 @@ void TestDeserializer::DeserializeBuffer(const uint8_t* start, size_t size) { EXPECT_FALSE(parse_error); } - if (columns.size() == 0) { + if (columns.empty()) { EXPECT_EQ(num_cells, 0u); } else { EXPECT_EQ(num_cells % columns.size(), 0u); diff --git a/src/trace_processor/storage/trace_storage.h b/src/trace_processor/storage/trace_storage.h index c77913cf0..4af07a40f 100644 --- a/src/trace_processor/storage/trace_storage.h +++ b/src/trace_processor/storage/trace_storage.h @@ -634,7 +634,7 @@ class TraceStorage { const auto& args = arg_table(); RowMap filtered = args.FilterToRowMap( {args.arg_set_id().eq(arg_set_id), args.key().eq(key)}); - if (filtered.size() == 0) { + if (filtered.empty()) { *result = base::nullopt; return util::OkStatus(); } diff --git a/src/traced/probes/ftrace/ftrace_procfs.cc b/src/traced/probes/ftrace/ftrace_procfs.cc index 480d3031b..7a206da72 100644 --- a/src/traced/probes/ftrace/ftrace_procfs.cc +++ b/src/traced/probes/ftrace/ftrace_procfs.cc @@ -116,7 +116,7 @@ std::vector<std::string> FtraceProcfs::ReadEnabledEvents() { std::vector<std::string> events; while (ss.Next()) { std::string event = ss.cur_token(); - if (event.size() == 0) + if (event.empty()) continue; events.push_back(base::StripChars(event, ":", '/')); } diff --git a/src/traced/probes/power/android_power_data_source.cc b/src/traced/probes/power/android_power_data_source.cc index 0b4e749ce..a77cee854 100644 --- a/src/traced/probes/power/android_power_data_source.cc +++ b/src/traced/probes/power/android_power_data_source.cc @@ -208,7 +208,7 @@ void AndroidPowerDataSource::WritePowerRailsData() { // all rail names etc. on each one. rail_descriptors_logged_ = true; auto rail_descriptors = lib_->GetRailDescriptors(); - if (rail_descriptors.size() == 0) { + if (rail_descriptors.empty()) { // No rails to collect data for. Don't try again in the next iteration. rails_collection_enabled_ = false; return; |