From c5e9f18c47e196362212703aa21e561ff95ecff8 Mon Sep 17 00:00:00 2001 From: Andrew Noyes Date: Wed, 17 Jul 2024 18:57:12 -0700 Subject: [PATCH] Remove some unnecessary std::exchange's --- ConflictSet.cpp | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/ConflictSet.cpp b/ConflictSet.cpp index 92c742a..a71e9ee 100644 --- a/ConflictSet.cpp +++ b/ConflictSet.cpp @@ -3152,23 +3152,16 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl { conflicts_accum += result[i] == Conflict; too_olds_accum += result[i] == TooOld; } - point_read_total.add(std::exchange(tls.point_read_accum, 0)); - prefix_read_total.add(std::exchange(tls.prefix_read_accum, 0)); - range_read_total.add(std::exchange(tls.range_read_accum, 0)); - range_read_node_scan_total.add( - std::exchange(tls.range_read_node_scan_accum, 0)); - point_read_short_circuit_total.add( - std::exchange(tls.point_read_short_circuit_accum, 0)); - prefix_read_short_circuit_total.add( - std::exchange(tls.prefix_read_short_circuit_accum, 0)); - range_read_short_circuit_total.add( - std::exchange(tls.range_read_short_circuit_accum, 0)); - point_read_iterations_total.add( - std::exchange(tls.point_read_iterations_accum, 0)); - prefix_read_iterations_total.add( - std::exchange(tls.prefix_read_iterations_accum, 0)); - range_read_iterations_total.add( - std::exchange(tls.range_read_iterations_accum, 0)); + point_read_total.add(tls.point_read_accum); + prefix_read_total.add(tls.prefix_read_accum); + range_read_total.add(tls.range_read_accum); + range_read_node_scan_total.add(tls.range_read_node_scan_accum); + point_read_short_circuit_total.add(tls.point_read_short_circuit_accum); + prefix_read_short_circuit_total.add(tls.prefix_read_short_circuit_accum); + range_read_short_circuit_total.add(tls.range_read_short_circuit_accum); + point_read_iterations_total.add(tls.point_read_iterations_accum); + prefix_read_iterations_total.add(tls.prefix_read_iterations_accum); + range_read_iterations_total.add(tls.range_read_iterations_accum); commits_total.add(commits_accum); conflicts_total.add(conflicts_accum); too_olds_total.add(too_olds_accum);