From 39144201db306ffc33c9853efe1537f0391d1f4a Mon Sep 17 00:00:00 2001
From: arvidn <arvid@libtorrent.org>
Date: Sat, 6 Jan 2018 18:20:59 +0100
Subject: [PATCH] mark up performance counter operations as noexcept

---
 include/libtorrent/performance_counters.hpp | 19 ++++++++++++-------
 src/performance_counters.cpp                | 20 ++++++++++----------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/include/libtorrent/performance_counters.hpp b/include/libtorrent/performance_counters.hpp
index 092b92d62..757379871 100644
--- a/include/libtorrent/performance_counters.hpp
+++ b/include/libtorrent/performance_counters.hpp
@@ -456,18 +456,23 @@ namespace libtorrent {
 			num_counters,
 			num_gauges_counters = num_counters - num_stats_counters
 		};
+#ifdef ATOMIC_LLONG_LOCK_FREE
+#define TORRENT_COUNTER_NOEXCEPT noexcept
+#else
+#define TORRENT_COUNTER_NOEXCEPT
+#endif
 
-		counters();
+		counters() TORRENT_COUNTER_NOEXCEPT;
 
-		counters(counters const&);
-		counters& operator=(counters const&);
+		counters(counters const&) TORRENT_COUNTER_NOEXCEPT;
+		counters& operator=(counters const&) TORRENT_COUNTER_NOEXCEPT;
 
 		// returns the new value
-		std::int64_t inc_stats_counter(int c, std::int64_t value = 1);
-		std::int64_t operator[](int i) const;
+		std::int64_t inc_stats_counter(int c, std::int64_t value = 1) TORRENT_COUNTER_NOEXCEPT;
+		std::int64_t operator[](int i) const TORRENT_COUNTER_NOEXCEPT;
 
-		void set_value(int c, std::int64_t value);
-		void blend_stats_counter(int c, std::int64_t value, int ratio);
+		void set_value(int c, std::int64_t value) TORRENT_COUNTER_NOEXCEPT;
+		void blend_stats_counter(int c, std::int64_t value, int ratio) TORRENT_COUNTER_NOEXCEPT;
 
 	private:
 
diff --git a/src/performance_counters.cpp b/src/performance_counters.cpp
index 3a71130d5..0176009d3 100644
--- a/src/performance_counters.cpp
+++ b/src/performance_counters.cpp
@@ -36,17 +36,17 @@ POSSIBILITY OF SUCH DAMAGE.
 
 namespace libtorrent {
 
-	counters::counters()
+	counters::counters() TORRENT_COUNTER_NOEXCEPT
 	{
 #ifdef ATOMIC_LLONG_LOCK_FREE
 		for (auto& counter : m_stats_counter)
 			counter.store(0, std::memory_order_relaxed);
 #else
-		std::memset(m_stats_counter, 0, sizeof(m_stats_counter));
+		m_stats_counter.fill(0);
 #endif
 	}
 
-	counters::counters(counters const& c)
+	counters::counters(counters const& c) TORRENT_COUNTER_NOEXCEPT
 	{
 #ifdef ATOMIC_LLONG_LOCK_FREE
 		for (int i = 0; i < m_stats_counter.end_index(); ++i)
@@ -55,11 +55,11 @@ namespace libtorrent {
 					, std::memory_order_relaxed);
 #else
 		std::lock_guard<std::mutex> l(c.m_mutex);
-		std::memcpy(m_stats_counter, c.m_stats_counter, sizeof(m_stats_counter));
+		m_stats_counter = c.m_stats_counter;
 #endif
 	}
 
-	counters& counters::operator=(counters const& c)
+	counters& counters::operator=(counters const& c) TORRENT_COUNTER_NOEXCEPT
 	{
 		if (&c == this) return *this;
 #ifdef ATOMIC_LLONG_LOCK_FREE
@@ -70,12 +70,12 @@ namespace libtorrent {
 #else
 		std::lock_guard<std::mutex> l(m_mutex);
 		std::lock_guard<std::mutex> l2(c.m_mutex);
-		std::memcpy(m_stats_counter, c.m_stats_counter, sizeof(m_stats_counter));
+		m_stats_counter = c.m_stats_counter;
 #endif
 		return *this;
 	}
 
-	std::int64_t counters::operator[](int i) const
+	std::int64_t counters::operator[](int i) const TORRENT_COUNTER_NOEXCEPT
 	{
 		TORRENT_ASSERT(i >= 0);
 		TORRENT_ASSERT(i < num_counters);
@@ -90,7 +90,7 @@ namespace libtorrent {
 
 	// the argument specifies which counter to
 	// increment or decrement
-	std::int64_t counters::inc_stats_counter(int const c, std::int64_t const value)
+	std::int64_t counters::inc_stats_counter(int const c, std::int64_t const value) TORRENT_COUNTER_NOEXCEPT
 	{
 		// if c >= num_stats_counters, it means it's not
 		// a monotonically increasing counter, but a gauge
@@ -112,7 +112,7 @@ namespace libtorrent {
 
 	// ratio is a value between 0 and 100 representing the percentage the value
 	// is blended in at.
-	void counters::blend_stats_counter(int const c, std::int64_t const value, int const ratio)
+	void counters::blend_stats_counter(int const c, std::int64_t const value, int const ratio) TORRENT_COUNTER_NOEXCEPT
 	{
 		TORRENT_ASSERT(c >= num_stats_counters);
 		TORRENT_ASSERT(c < num_counters);
@@ -135,7 +135,7 @@ namespace libtorrent {
 #endif
 	}
 
-	void counters::set_value(int const c, std::int64_t const value)
+	void counters::set_value(int const c, std::int64_t const value) TORRENT_COUNTER_NOEXCEPT
 	{
 		TORRENT_ASSERT(c >= 0);
 		TORRENT_ASSERT(c < num_counters);