Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix a bunch of copy-instead-of-move findings from Coverity

Browse source
This commit is contained in:
Tim Wojtulewicz 2024-06-03 09:34:17 -07:00
parent 433c257886
commit 65678fbfdb
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/telemetry/Counter.cc
View file

@ -5,7 +5,7 @@ using namespace zeek::telemetry;
Counter::Counter(FamilyType* family, const prometheus::Labels& labels, prometheus::CollectCallbackPtr callback) noexcept Counter::Counter(FamilyType* family, const prometheus::Labels& labels, prometheus::CollectCallbackPtr callback) noexcept
: handle(family->Add(labels)), labels(labels) { : handle(family->Add(labels)), labels(labels) {
if ( callback ) { if ( callback ) {
handle.AddCollectCallback(callback); handle.AddCollectCallback(std::move(callback));
has_callback = true; has_callback = true;
} }
} }
@ -37,5 +37,5 @@ std::shared_ptr<Counter> CounterFamily::GetOrAdd(Span<const LabelView> labels,
std::shared_ptr<Counter> CounterFamily::GetOrAdd(std::initializer_list<LabelView> labels, std::shared_ptr<Counter> CounterFamily::GetOrAdd(std::initializer_list<LabelView> labels,
prometheus::CollectCallbackPtr callback) { prometheus::CollectCallbackPtr callback) {
return GetOrAdd(Span{labels.begin(), labels.size()}, callback); return GetOrAdd(Span{labels.begin(), labels.size()}, std::move(callback));
} }

4
src/telemetry/Gauge.cc
View file

@ -17,7 +17,7 @@ double Gauge::Value() const noexcept {
Gauge::Gauge(FamilyType* family, const prometheus::Labels& labels, prometheus::CollectCallbackPtr callback) noexcept Gauge::Gauge(FamilyType* family, const prometheus::Labels& labels, prometheus::CollectCallbackPtr callback) noexcept
: handle(family->Add(labels)), labels(labels) { : handle(family->Add(labels)), labels(labels) {
if ( callback ) { if ( callback ) {
handle.AddCollectCallback(callback); handle.AddCollectCallback(std::move(callback));
has_callback = true; has_callback = true;
} }
} }
@ -37,5 +37,5 @@ std::shared_ptr<Gauge> GaugeFamily::GetOrAdd(Span<const LabelView> labels, prome
std::shared_ptr<Gauge> GaugeFamily::GetOrAdd(std::initializer_list<LabelView> labels, std::shared_ptr<Gauge> GaugeFamily::GetOrAdd(std::initializer_list<LabelView> labels,
prometheus::CollectCallbackPtr callback) { prometheus::CollectCallbackPtr callback) {
return GetOrAdd(Span{labels.begin(), labels.size()}, callback); return GetOrAdd(Span{labels.begin(), labels.size()}, std::move(callback));
} }

20
src/telemetry/Manager.cc
View file

@ -265,10 +265,10 @@ ValPtr Manager::CollectMetrics(std::string_view prefix_pattern, std::string_view
label_values_vec->Append(make_intrusive<StringVal>(lbl.value)); label_values_vec->Append(make_intrusive<StringVal>(lbl.value));
} }
r->Assign(label_names_idx, label_names_vec); r->Assign(label_names_idx, std::move(label_names_vec));
r->Assign(label_values_idx, label_values_vec); r->Assign(label_values_idx, std::move(label_values_vec));
ret_val->Append(r); ret_val->Append(std::move(r));
} }
} }
@ -285,7 +285,7 @@ ValPtr Manager::CollectMetrics(std::string_view prefix_pattern, std::string_view
} }
} }
return ret_val; return std::move(ret_val);
} }
ValPtr Manager::CollectHistogramMetrics(std::string_view prefix_pattern, std::string_view name_pattern) { ValPtr Manager::CollectHistogramMetrics(std::string_view prefix_pattern, std::string_view name_pattern) {
@ -337,8 +337,8 @@ ValPtr Manager::CollectHistogramMetrics(std::string_view prefix_pattern, std::st
label_values_vec->Append(make_intrusive<StringVal>(lbl.value)); label_values_vec->Append(make_intrusive<StringVal>(lbl.value));
} }
r->Assign(label_names_idx, label_names_vec); r->Assign(label_names_idx, std::move(label_names_vec));
r->Assign(label_values_idx, label_values_vec); r->Assign(label_values_idx, std::move(label_values_vec));
auto double_values_vec = make_intrusive<zeek::VectorVal>(double_vec_type); auto double_values_vec = make_intrusive<zeek::VectorVal>(double_vec_type);
std::vector<double> boundaries; std::vector<double> boundaries;
@ -361,9 +361,9 @@ ValPtr Manager::CollectHistogramMetrics(std::string_view prefix_pattern, std::st
r->Assign(sum_idx, zeek::make_intrusive<DoubleVal>(inst.histogram.sample_sum)); r->Assign(sum_idx, zeek::make_intrusive<DoubleVal>(inst.histogram.sample_sum));
RecordValPtr local_opts_record = r->GetField<RecordVal>(opts_idx); RecordValPtr local_opts_record = r->GetField<RecordVal>(opts_idx);
local_opts_record->Assign(bounds_idx, bounds_vec); local_opts_record->Assign(bounds_idx, std::move(bounds_vec));
ret_val->Append(r); ret_val->Append(std::move(r));
} }
} }
@ -380,7 +380,7 @@ ValPtr Manager::CollectHistogramMetrics(std::string_view prefix_pattern, std::st
} }
} }
return ret_val; return std::move(ret_val);
} }
void Manager::BuildClusterJson() { void Manager::BuildClusterJson() {
@ -488,7 +488,7 @@ GaugePtr Manager::GaugeInstance(std::string_view prefix, std::string_view name,
std::string_view helptext, std::string_view unit, std::string_view helptext, std::string_view unit,
prometheus::CollectCallbackPtr callback) { prometheus::CollectCallbackPtr callback) {
auto lbl_span = Span{labels.begin(), labels.size()}; auto lbl_span = Span{labels.begin(), labels.size()};
return GaugeInstance(prefix, name, lbl_span, helptext, unit, callback); return GaugeInstance(prefix, name, lbl_span, helptext, unit, std::move(callback));
} }
HistogramFamilyPtr Manager::HistogramFamily(std::string_view prefix, std::string_view name, HistogramFamilyPtr Manager::HistogramFamily(std::string_view prefix, std::string_view name,