From d914119e3bd29ccc50c185818cfce0d938be3d5c Mon Sep 17 00:00:00 2001
From: Florian Fischer <florian.fischer@muhq.space>
Date: Tue, 21 Sep 2021 10:29:35 +0200
Subject: [PATCH] [io] take const string& and s/ReUsePort/ReusePort/
---
emper/io.hpp | 8 ++++----
emper/io/io.cpp | 7 ++++---
tests/fixtures/network.cpp | 4 ++--
tests/fixtures/network.hpp | 4 ++--
tests/io/ConcurrentNetworkEchoTest.cpp | 2 +-
tests/io/SimpleNetworkTest.cpp | 2 +-
6 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/emper/io.hpp b/emper/io.hpp
index b36b287b..db52092b 100644
--- a/emper/io.hpp
+++ b/emper/io.hpp
@@ -645,7 +645,7 @@ struct SockOpt {
socklen_t val_len;
static const int ENABLE;
- static const SockOpt ReUsePort;
+ static const SockOpt ReusePort;
};
/**
@@ -660,7 +660,7 @@ struct SockOpt {
*
* @return nullptr on error, otherwise the TCP listener Fiber
*/
-auto tcp_listener(std::string &host, std::string &port, const std::function<void(int)> &handler,
- int backlog = 1024, const std::vector<SockOpt> &sockopts = std::vector<SockOpt>())
- -> Fiber *;
+auto tcp_listener(const std::string &host, const std::string &port,
+ const std::function<void(int)> &handler, int backlog = 1024,
+ const std::vector<SockOpt> &sockopts = std::vector<SockOpt>()) -> Fiber *;
} // namespace emper::io
diff --git a/emper/io/io.cpp b/emper/io/io.cpp
index bba906cd..f7ef9aa2 100644
--- a/emper/io/io.cpp
+++ b/emper/io/io.cpp
@@ -24,7 +24,7 @@ namespace fs = std::filesystem;
namespace emper::io {
const int SockOpt::ENABLE = 1;
-const SockOpt SockOpt::ReUsePort = {SOL_SOCKET, SO_REUSEPORT, &SockOpt::ENABLE,
+const SockOpt SockOpt::ReusePort = {SOL_SOCKET, SO_REUSEPORT, &SockOpt::ENABLE,
sizeof(SockOpt::ENABLE)};
static void recursive_directory_walk_helper(
@@ -58,8 +58,9 @@ void recursive_directory_walk(const fs::path& dirpath,
cps.wait();
}
-auto tcp_listener(std::string& host, std::string& port, const std::function<void(int)>& handler,
- int backlog, const std::vector<SockOpt>& sockopts) -> Fiber* {
+auto tcp_listener(const std::string& host, const std::string& port,
+ const std::function<void(int)>& handler, int backlog,
+ const std::vector<SockOpt>& sockopts) -> Fiber* {
int listen_socket;
struct addrinfo* servaddr;
diff --git a/tests/fixtures/network.cpp b/tests/fixtures/network.cpp
index 5bbf01ce..c21cf7c3 100644
--- a/tests/fixtures/network.cpp
+++ b/tests/fixtures/network.cpp
@@ -48,8 +48,8 @@ void echo_serve(int client_socket) {
}
}
-void echo_client(std::string& host, std::string& port, const std::vector<std::string>& msgs,
- size_t iterations) {
+void echo_client(const std::string& host, const std::string& port,
+ const std::vector<std::string>& msgs, size_t iterations) {
struct addrinfo* server;
int err = getaddrinfo(host.c_str(), port.c_str(), nullptr, &server);
diff --git a/tests/fixtures/network.hpp b/tests/fixtures/network.hpp
index 8c50c153..d5137b16 100644
--- a/tests/fixtures/network.hpp
+++ b/tests/fixtures/network.hpp
@@ -8,5 +8,5 @@
void echo_serve(int client_socket);
-void echo_client(std::string& host, std::string& port, const std::vector<std::string>& msgs,
- size_t iterations = 1);
+void echo_client(const std::string& host, const std::string& port,
+ const std::vector<std::string>& msgs, size_t iterations = 1);
diff --git a/tests/io/ConcurrentNetworkEchoTest.cpp b/tests/io/ConcurrentNetworkEchoTest.cpp
index 4f3b8d23..ee09893d 100644
--- a/tests/io/ConcurrentNetworkEchoTest.cpp
+++ b/tests/io/ConcurrentNetworkEchoTest.cpp
@@ -43,7 +43,7 @@ auto main(int argc, char* argv[]) -> int {
Runtime runtime;
Fiber* listener =
- emper::io::tcp_listener(host, port, echo_serve, 1024, {emper::io::SockOpt::ReUsePort});
+ emper::io::tcp_listener(host, port, echo_serve, 1024, {emper::io::SockOpt::ReusePort});
if (!listener) {
DIE_MSG("failed to create listener");
}
diff --git a/tests/io/SimpleNetworkTest.cpp b/tests/io/SimpleNetworkTest.cpp
index 3040f69b..4f1f76c4 100644
--- a/tests/io/SimpleNetworkTest.cpp
+++ b/tests/io/SimpleNetworkTest.cpp
@@ -19,7 +19,7 @@ void emperTest() {
CPS cps;
Fiber* listener =
- emper::io::tcp_listener(addr, port, echo_serve, 1024, {emper::io::SockOpt::ReUsePort});
+ emper::io::tcp_listener(addr, port, echo_serve, 1024, {emper::io::SockOpt::ReusePort});
if (!listener) {
DIE_MSG("failed to create listener");
}
--
GitLab