Add static checker config + small fixes (clang-tidy, clazy)

tstenner · tstenner · commit 3b5af4c7aec6 · 2021-11-13T11:44:09.000+01:00
diff --git a/.clang-tidy b/.clang-tidy
@@ -0,0 +1,17 @@
+---
+Checks: |
+    modernize-*,
+        -modernize-use-trailing-return-type,
+        -modernize-avoid-c-arrays,
+    isc-*,
+    performance-*,
+    readability-*,
+        -readability-braces-around-statements,
+        -readability-implicit-bool-conversion,
+        -readability-magic-numbers,
+        -readability-isolate-declaration,
+        -readability-function-cognitive-complexity,
+    bugprone-*,
+    concurrency-*
+    portability-*
+...
diff --git a/include/lsl_cpp.h b/include/lsl_cpp.h
@@ -790,7 +790,7 @@ class stream_outlet {
 
 	/// Check whether a given data length matches the number of channels; throw if not
 	void check_numchan(std::size_t N) const {
-		if (N != channel_count)
+		if (N != static_cast<std::size_t>(channel_count))
 			throw std::runtime_error("Provided element count (" + std::to_string(N) +
 									 ") does not match the stream's channel count (" +
 									 std::to_string(channel_count) + '.');
diff --git a/src/inlet_connection.cpp b/src/inlet_connection.cpp
@@ -127,24 +127,23 @@ ip::address resolve_v6_addr(const std::string &addr) {
 tcp::endpoint inlet_connection::get_tcp_endpoint() {
 	shared_lock_t lock(host_info_mut_);
 	if (tcp_protocol_ == tcp::v4())
-		return tcp::endpoint(ip::make_address(host_info_.v4address()), host_info_.v4data_port());
+		return {ip::make_address(host_info_.v4address()), host_info_.v4data_port()};
 
 	std::string addr = host_info_.v6address();
 	uint16_t port = host_info_.v6data_port();
 	lock.unlock();
-	return tcp::endpoint(resolve_v6_addr(addr), port);
+	return {resolve_v6_addr(addr), port};
 }
 
 udp::endpoint inlet_connection::get_udp_endpoint() {
 	shared_lock_t lock(host_info_mut_);
-
 	if (udp_protocol_ == udp::v4())
-		return udp::endpoint(ip::make_address(host_info_.v4address()), host_info_.v4service_port());
+		return {ip::make_address(host_info_.v4address()), host_info_.v4service_port()};
 
 	std::string addr = host_info_.v6address();
 	uint16_t port = host_info_.v6service_port();
 	lock.unlock();
-	return udp::endpoint(resolve_v6_addr(addr), port);
+	return {resolve_v6_addr(addr), port};
 }
 
 std::string inlet_connection::current_uid() {
diff --git a/testing/ext/DataType.cpp b/testing/ext/DataType.cpp
@@ -5,12 +5,14 @@
 #include <lsl_cpp.h>
 #include <thread>
 
+// clazy:excludeall=non-pod-global-static
+
 TEMPLATE_TEST_CASE(
 	"datatransfer", "[datatransfer][basic]", char, int16_t, int32_t, int64_t, float, double) {
 	const int numBounces = sizeof(TestType) * 8;
 	double timestamps[numBounces][2];
 	const char *name = SampleType<TestType>::fmt_string();
-	lsl::channel_format_t cf = (lsl::channel_format_t)SampleType<TestType>::chan_fmt;
+	auto cf = static_cast<lsl::channel_format_t>(SampleType<TestType>::chan_fmt);
 
 	Streampair sp(create_streampair(
 		lsl::stream_info(name, "Bounce", 2, lsl::IRREGULAR_RATE, cf, "streamid")));
@@ -60,8 +62,8 @@ TEST_CASE("TypeConversion", "[datatransfer][types][basic]") {
 	Streampair sp{create_streampair(
 		lsl::stream_info("TypeConversion", "int2str2int", 1, 1, lsl::cf_string, "TypeConversion"))};
 	const int num_bounces = 31;
-	std::vector<int32_t> data;
-	for (int i = 0; i < num_bounces; ++i) data.push_back(1 << i);
+	std::vector<int32_t> data(num_bounces);
+	for (int i = 0; i < num_bounces; ++i) data[i] = 1 << i;
 
 	sp.out_.push_chunk_multiplexed(data);
 
@@ -88,11 +90,11 @@ TEST_CASE("Flush", "[datatransfer][basic]") {
 		}
 	});
 
-	double data_in, ts_in;
-	ts_in = sp.in_.pull_sample(&data_in, 1.);
+	double data_in;
+	double ts_in = sp.in_.pull_sample(&data_in, 1.);
 	REQUIRE(ts_in == Approx(data_in));
 	std::this_thread::sleep_for(std::chrono::milliseconds(700));
-	int pulled = sp.in_.flush() + 1;
+	auto pulled = sp.in_.flush() + 1;
 
 	for(; pulled < n; ++pulled) {
 		INFO(pulled);
diff --git a/testing/ext/bench_bounce.cpp b/testing/ext/bench_bounce.cpp
@@ -3,6 +3,8 @@
 #include <catch2/catch.hpp>
 #include <lsl_cpp.h>
 
+// clazy:excludeall=non-pod-global-static
+
 TEST_CASE("bounce", "[basic][latency]") {
 	auto sp = create_streampair(lsl::stream_info("bounce", "Test"));
 
diff --git a/testing/ext/bench_common.cpp b/testing/ext/bench_common.cpp
@@ -1,6 +1,8 @@
 #include <catch2/catch.hpp>
 #include <lsl_c.h>
 
+// clazy:excludeall=non-pod-global-static
+
 TEST_CASE("common") {
 	BENCHMARK("lsl_clock") { return lsl_local_clock(); };
 }
diff --git a/testing/ext/bench_pushpull.cpp b/testing/ext/bench_pushpull.cpp
@@ -7,6 +7,8 @@
 #include <string>
 #include <thread>
 
+// clazy:excludeall=non-pod-global-static
+
 template<typename T>
 struct sample_value {};
 template<> struct sample_value<char> { static constexpr char val = 122; };
@@ -42,12 +44,13 @@ TEMPLATE_TEST_CASE("pushpull", "[basic][throughput]", char, double, std::string)
 
 			BENCHMARK("push_sample_nchan_" + suffix) {
 				for (size_t s = 0; s < chunk_size; s++) out.push_sample(data);
+				for (auto &inlet : inlet_list) inlet.flush();
 			};
 
 			BENCHMARK("push_chunk_nchan_" + suffix) {
 				out.push_chunk_multiplexed(data, chunk_size);
+				for (auto &inlet : inlet_list) inlet.flush();
 			};
-			for (auto &inlet : inlet_list) inlet.flush();
 		}
 	}
 }
diff --git a/testing/ext/discovery.cpp b/testing/ext/discovery.cpp
@@ -2,6 +2,8 @@
 #include <lsl_cpp.h>
 #include <thread>
 
+// clazy:excludeall=non-pod-global-static
+
 namespace {
 
 TEST_CASE("resolve multiple streams", "[resolver][basic]") {
diff --git a/testing/ext/move.cpp b/testing/ext/move.cpp
@@ -2,6 +2,8 @@
 #include <lsl_cpp.h>
 #include <thread>
 
+// clazy:excludeall=non-pod-global-static
+
 namespace {
 
 TEST_CASE("move C++ API types", "[move][basic]") {
diff --git a/testing/ext/streaminfo.cpp b/testing/ext/streaminfo.cpp
@@ -2,6 +2,8 @@
 #include <lsl_cpp.h>
 #include <thread>
 
+// clazy:excludeall=non-pod-global-static
+
 namespace {
 
 TEST_CASE("streaminfo", "[streaminfo][basic]") {
diff --git a/testing/ext/time.cpp b/testing/ext/time.cpp
@@ -4,6 +4,8 @@
 #include <lsl_cpp.h>
 #include <thread>
 
+// clazy:excludeall=non-pod-global-static
+
 namespace {
 
 TEST_CASE("simple timesync", "[timesync][basic]") {
diff --git a/testing/int/bench_sleep.cpp b/testing/int/bench_sleep.cpp
@@ -2,6 +2,8 @@
 #include <common.h>
 #include <thread>
 
+// clazy:excludeall=non-pod-global-static
+
 TEST_CASE("sleep") {
 	BENCHMARK("sleep1ms") { std::this_thread::sleep_for(std::chrono::milliseconds(1)); };
 }
diff --git a/testing/int/bench_timesync.cpp b/testing/int/bench_timesync.cpp
@@ -4,6 +4,8 @@
 #include <sstream>
 #include <thread>
 
+// clazy:excludeall=non-pod-global-static
+
 using namespace asio::ip;
 
 TEST_CASE("timesync", "[basic][latency]") {
diff --git a/testing/int/inireader.cpp b/testing/int/inireader.cpp
@@ -2,6 +2,8 @@
 #include <catch2/catch.hpp>
 #include <sstream>
 
+// clazy:excludeall=non-pod-global-static
+
 void try_load(INI &pt, const char *contents) {
 	std::istringstream stream{std::string(contents)};
 	pt.load(stream);
diff --git a/testing/int/loguruthreadnames.cpp b/testing/int/loguruthreadnames.cpp
@@ -1,8 +1,10 @@
 #include <loguru.hpp>
 #include <thread>
-
+// Include loguru before catch
 #include <catch2/catch.hpp>
 
+// clazy:excludeall=non-pod-global-static
+
 TEST_CASE("loguru_thread_local_storage", "[threading]") {
 	char name[2] = "0";
 	loguru::set_thread_name("1");
diff --git a/testing/int/network.cpp b/testing/int/network.cpp
@@ -12,6 +12,8 @@
 #include <mutex>
 #include <thread>
 
+// clazy:excludeall=non-pod-global-static
+
 using namespace asio;
 using err_t = const asio::error_code &;
 
diff --git a/testing/int/postproc.cpp b/testing/int/postproc.cpp
@@ -2,9 +2,11 @@
 #include <loguru.hpp>
 #include <random>
 #include <thread>
-
+// include loguru before catch
 #include <catch2/catch.hpp>
 
+// clazy:excludeall=non-pod-global-static
+
 template <std::size_t N>
 inline void test_postproc_array(
 	lsl::time_postprocessor &pp, const double (&in)[N], const double (&expected)[N]) {
diff --git a/testing/int/samples.cpp b/testing/int/samples.cpp
@@ -4,6 +4,8 @@
 #include <catch2/catch.hpp>
 #include <thread>
 
+// clazy:excludeall=non-pod-global-static
+
 TEST_CASE("consumer_queue", "[queue][basic]") {
 	const int size = 10;
 	lsl::factory fac(lsl_channel_format_t::cft_int8, 4, size / 2);
diff --git a/testing/int/serialization_v100.cpp b/testing/int/serialization_v100.cpp
@@ -4,6 +4,8 @@
 #include <sstream>
 #include <type_traits>
 
+// clazy:excludeall=non-pod-global-static
+
 #define NO_EXPLICIT_TEMPLATE_INSTANTIATION
 #include "portable_archive/portable_iarchive.hpp"
 #include "portable_archive/portable_oarchive.hpp"
diff --git a/testing/int/streaminfo.cpp b/testing/int/streaminfo.cpp
@@ -2,9 +2,11 @@
 #include "../src/stream_info_impl.h"
 #include <cctype>
 #include <loguru.hpp>
-
+// include loguru before catch
 #include <catch2/catch.hpp>
 
+// clazy:excludeall=non-pod-global-static
+
 template<typename T, const std::size_t N>
 bool contains(const T(&valid)[N], const T target) {
 	for(T e: valid)
diff --git a/testing/int/stringfuncs.cpp b/testing/int/stringfuncs.cpp
@@ -1,6 +1,8 @@
 #include "util/strfuns.hpp"
 #include <catch2/catch.hpp>
 
+// clazy:excludeall=non-pod-global-static
+
 using vec = std::vector<std::string>;
 
 TEST_CASE("strings are split correctly", "[string][basic]") {
diff --git a/testing/int/tcpserver.cpp b/testing/int/tcpserver.cpp
@@ -11,6 +11,8 @@
 #include <sstream>
 #include <thread>
 
+// clazy:excludeall=non-pod-global-static
+
 using namespace asio::ip;
 using err_t = const asio::error_code &;
 using sock_t = tcp::socket;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`#include <catch2/catch.hpp>`
`2`	`2`	`#include <lsl_c.h>`
`3`	`3`
	`4`	`+// clazy:excludeall=non-pod-global-static`
	`5`	`+`
`4`	`6`	`TEST_CASE("common") {`
`5`	`7`	`BENCHMARK("lsl_clock") { return lsl_local_clock(); };`
`6`	`8`	`}`