Skip to content

Commit 332ec04

Browse files
ThalhammerThalhammer
committed
Add missing header, clang-format
1 parent a824a6d commit 332ec04

File tree

6 files changed

+42
-50
lines changed

6 files changed

+42
-50
lines changed

‎include/asyncpp/io/file.h

+6-9
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ namespace asyncpp::io {
102102
detail::io_engine::completion_data m_completion;
103103

104104
public:
105-
file_read_awaitable(io_engine* engine, io_engine::file_handle_t fd, void* buf, size_t len,
106-
uint64_t offset, std::error_code* ec) noexcept
105+
file_read_awaitable(io_engine* engine, io_engine::file_handle_t fd, void* buf, size_t len, uint64_t offset,
106+
std::error_code* ec) noexcept
107107
: m_engine(engine), m_fd(fd), m_buf(buf), m_len(len), m_offset(offset), m_ec(ec), m_completion{} {}
108108
bool await_ready() const noexcept { return false; }
109109
bool await_suspend(coroutine_handle<> hdl) {
@@ -113,8 +113,7 @@ namespace asyncpp::io {
113113
}
114114
size_t await_resume() {
115115
if (!m_completion.result) return m_completion.result_size;
116-
if (m_ec == nullptr)
117-
throw std::system_error(m_completion.result);
116+
if (m_ec == nullptr) throw std::system_error(m_completion.result);
118117
*m_ec = m_completion.result;
119118
return 0;
120119
}
@@ -141,7 +140,7 @@ namespace asyncpp::io {
141140

142141
public:
143142
file_write_awaitable(io_engine* engine, io_engine::file_handle_t fd, const void* buf, size_t len,
144-
uint64_t offset, std::error_code* ec) noexcept
143+
uint64_t offset, std::error_code* ec) noexcept
145144
: m_engine(engine), m_fd(fd), m_buf(buf), m_len(len), m_offset(offset), m_ec(ec), m_completion{} {}
146145
bool await_ready() const noexcept { return false; }
147146
bool await_suspend(coroutine_handle<> hdl) {
@@ -151,8 +150,7 @@ namespace asyncpp::io {
151150
}
152151
size_t await_resume() {
153152
if (!m_completion.result) return m_completion.result_size;
154-
if (m_ec == nullptr)
155-
throw std::system_error(m_completion.result);
153+
if (m_ec == nullptr) throw std::system_error(m_completion.result);
156154
*m_ec = m_completion.result;
157155
return 0;
158156
}
@@ -185,8 +183,7 @@ namespace asyncpp::io {
185183
}
186184
void await_resume() {
187185
if (!m_completion.result) return;
188-
if (m_ec == nullptr)
189-
throw std::system_error(m_completion.result);
186+
if (m_ec == nullptr) throw std::system_error(m_completion.result);
190187
*m_ec = m_completion.result;
191188
}
192189
};

‎include/asyncpp/io/socket.h

+22-31
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ namespace asyncpp::io {
102102

103103
[[nodiscard]] detail::io_engine::socket_handle_t native_handle() const noexcept { return m_fd; }
104104
[[nodiscard]] detail::io_engine::socket_handle_t release() noexcept {
105-
if(m_io != nullptr && m_fd != detail::io_engine::invalid_socket_handle)
105+
if (m_io != nullptr && m_fd != detail::io_engine::invalid_socket_handle)
106106
m_io->engine()->socket_release(m_fd);
107107
m_io = nullptr;
108108
m_remote_ep = {};
@@ -115,21 +115,19 @@ namespace asyncpp::io {
115115
[[nodiscard]] socket_accept_awaitable accept() noexcept;
116116
[[nodiscard]] socket_accept_error_code_awaitable accept(std::error_code& ec) noexcept;
117117
[[nodiscard]] socket_send_awaitable send(const void* buffer, std::size_t size) noexcept;
118-
[[nodiscard]] socket_send_awaitable send(const void* buffer, std::size_t size,
119-
std::error_code& ec) noexcept;
118+
[[nodiscard]] socket_send_awaitable send(const void* buffer, std::size_t size, std::error_code& ec) noexcept;
120119
[[nodiscard]] socket_recv_awaitable recv(void* buffer, std::size_t size) noexcept;
121-
[[nodiscard]] socket_recv_awaitable recv(void* buffer, std::size_t size,
122-
std::error_code& ec) noexcept;
120+
[[nodiscard]] socket_recv_awaitable recv(void* buffer, std::size_t size, std::error_code& ec) noexcept;
123121
[[nodiscard]] socket_recv_exact_awaitable recv_exact(void* buffer, std::size_t size) noexcept;
124122
[[nodiscard]] socket_recv_exact_awaitable recv_exact(void* buffer, std::size_t size,
125-
std::error_code& ec) noexcept;
126-
[[nodiscard]] socket_send_to_awaitable send_to(const void* buffer, std::size_t size,
127-
const endpoint& dst_ep) noexcept;
123+
std::error_code& ec) noexcept;
128124
[[nodiscard]] socket_send_to_awaitable send_to(const void* buffer, std::size_t size,
129-
const endpoint& dst_ep, std::error_code& ec) noexcept;
125+
const endpoint& dst_ep) noexcept;
126+
[[nodiscard]] socket_send_to_awaitable send_to(const void* buffer, std::size_t size, const endpoint& dst_ep,
127+
std::error_code& ec) noexcept;
130128
[[nodiscard]] socket_recv_from_awaitable recv_from(void* buffer, std::size_t size) noexcept;
131129
[[nodiscard]] socket_recv_from_awaitable recv_from(void* buffer, std::size_t size,
132-
std::error_code& ec) noexcept;
130+
std::error_code& ec) noexcept;
133131

134132
[[nodiscard]] socket_connect_cancellable_awaitable connect(const endpoint& ep, asyncpp::stop_token st) noexcept;
135133
[[nodiscard]] socket_connect_cancellable_awaitable connect(const endpoint& ep, asyncpp::stop_token st,
@@ -249,7 +247,7 @@ namespace asyncpp::io {
249247

250248
public:
251249
socket_send_awaitable(socket& sock, const void* buffer, std::size_t size,
252-
std::error_code* ec = nullptr) noexcept
250+
std::error_code* ec = nullptr) noexcept
253251
: socket_awaitable_base{sock}, m_buffer{buffer}, m_size{size}, m_ec{ec} {}
254252
bool await_suspend(coroutine_handle<> hdl);
255253
void await_resume();
@@ -261,8 +259,7 @@ namespace asyncpp::io {
261259
std::error_code* const m_ec;
262260

263261
public:
264-
socket_recv_awaitable(socket& sock, void* buffer, std::size_t size,
265-
std::error_code* ec = nullptr) noexcept
262+
socket_recv_awaitable(socket& sock, void* buffer, std::size_t size, std::error_code* ec = nullptr) noexcept
266263
: socket_awaitable_base{sock}, m_buffer{buffer}, m_size{size}, m_ec{ec} {}
267264
bool await_suspend(coroutine_handle<> hdl);
268265
size_t await_resume();
@@ -277,7 +274,7 @@ namespace asyncpp::io {
277274

278275
public:
279276
socket_recv_exact_awaitable(asyncpp::io::socket& sock, void* buffer, std::size_t size,
280-
std::error_code* ec = nullptr) noexcept
277+
std::error_code* ec = nullptr) noexcept
281278
: socket_awaitable_base{sock}, m_buffer{static_cast<unsigned char*>(buffer)}, m_size{size},
282279
m_remaining{size}, m_ec{ec} {}
283280
bool await_suspend(asyncpp::coroutine_handle<> hdl);
@@ -309,7 +306,7 @@ namespace asyncpp::io {
309306

310307
public:
311308
socket_send_to_awaitable(socket& sock, const void* buffer, std::size_t size, endpoint dst,
312-
std::error_code* ec = nullptr) noexcept
309+
std::error_code* ec = nullptr) noexcept
313310
: socket_awaitable_base{sock}, m_buffer{buffer}, m_size{size}, m_destination{dst}, m_ec{ec} {}
314311
bool await_suspend(coroutine_handle<> hdl);
315312
size_t await_resume();
@@ -322,8 +319,7 @@ namespace asyncpp::io {
322319
std::error_code* const m_ec;
323320

324321
public:
325-
socket_recv_from_awaitable(socket& sock, void* buffer, std::size_t size,
326-
std::error_code* ec = nullptr) noexcept
322+
socket_recv_from_awaitable(socket& sock, void* buffer, std::size_t size, std::error_code* ec = nullptr) noexcept
327323
: socket_awaitable_base{sock}, m_buffer{buffer}, m_size{size}, m_ec{ec} {}
328324
bool await_suspend(coroutine_handle<> hdl);
329325
std::pair<size_t, endpoint> await_resume();
@@ -333,14 +329,11 @@ namespace asyncpp::io {
333329
return socket_connect_awaitable(*this, ep);
334330
}
335331

336-
[[nodiscard]] inline socket_connect_awaitable socket::connect(const endpoint& ep,
337-
std::error_code& ec) noexcept {
332+
[[nodiscard]] inline socket_connect_awaitable socket::connect(const endpoint& ep, std::error_code& ec) noexcept {
338333
return socket_connect_awaitable(*this, ep, &ec);
339334
}
340335

341-
[[nodiscard]] inline socket_accept_awaitable socket::accept() noexcept {
342-
return socket_accept_awaitable(*this);
343-
}
336+
[[nodiscard]] inline socket_accept_awaitable socket::accept() noexcept { return socket_accept_awaitable(*this); }
344337

345338
[[nodiscard]] inline socket_accept_error_code_awaitable socket::accept(std::error_code& ec) noexcept {
346339
return socket_accept_error_code_awaitable(*this, ec);
@@ -351,7 +344,7 @@ namespace asyncpp::io {
351344
}
352345

353346
[[nodiscard]] inline socket_send_awaitable socket::send(const void* buffer, std::size_t size,
354-
std::error_code& ec) noexcept {
347+
std::error_code& ec) noexcept {
355348
return socket_send_awaitable(*this, buffer, size, &ec);
356349
}
357350

@@ -360,22 +353,21 @@ namespace asyncpp::io {
360353
}
361354

362355
[[nodiscard]] inline socket_recv_awaitable socket::recv(void* buffer, std::size_t size,
363-
std::error_code& ec) noexcept {
356+
std::error_code& ec) noexcept {
364357
return socket_recv_awaitable(*this, buffer, size, &ec);
365358
}
366359

367-
[[nodiscard]] inline socket_recv_exact_awaitable socket::recv_exact(void* buffer,
368-
std::size_t size) noexcept {
360+
[[nodiscard]] inline socket_recv_exact_awaitable socket::recv_exact(void* buffer, std::size_t size) noexcept {
369361
return socket_recv_exact_awaitable(*this, buffer, size);
370362
}
371363

372364
[[nodiscard]] inline socket_recv_exact_awaitable socket::recv_exact(void* buffer, std::size_t size,
373-
std::error_code& ec) noexcept {
365+
std::error_code& ec) noexcept {
374366
return socket_recv_exact_awaitable(*this, buffer, size, &ec);
375367
}
376368

377369
[[nodiscard]] inline socket_send_to_awaitable socket::send_to(const void* buffer, std::size_t size,
378-
const endpoint& dst_ep) noexcept {
370+
const endpoint& dst_ep) noexcept {
379371
return socket_send_to_awaitable(*this, buffer, size, dst_ep);
380372
}
381373

@@ -384,13 +376,12 @@ namespace asyncpp::io {
384376
return socket_send_to_awaitable(*this, buffer, size, dst_ep, &ec);
385377
}
386378

387-
[[nodiscard]] inline socket_recv_from_awaitable socket::recv_from(void* buffer,
388-
std::size_t size) noexcept {
379+
[[nodiscard]] inline socket_recv_from_awaitable socket::recv_from(void* buffer, std::size_t size) noexcept {
389380
return socket_recv_from_awaitable(*this, buffer, size);
390381
}
391382

392383
[[nodiscard]] inline socket_recv_from_awaitable socket::recv_from(void* buffer, std::size_t size,
393-
std::error_code& ec) noexcept {
384+
std::error_code& ec) noexcept {
394385
return socket_recv_from_awaitable(*this, buffer, size, &ec);
395386
}
396387

‎src/io_engine.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ namespace asyncpp::io::detail {
2222
else if (!engine.empty())
2323
throw std::runtime_error("unknown io engine " + std::string(engine));
2424
}
25-
#ifdef _WIN32
25+
#ifdef _WIN32
2626
return create_io_engine_win32cq();
27-
#else
27+
#else
2828
if (auto uring = create_io_engine_uring(); uring != nullptr) return uring;
2929
return create_io_engine_select();
30-
#endif
30+
#endif
3131
}
3232
} // namespace asyncpp::io::detail

‎src/io_engine_select.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ namespace asyncpp::io::detail {
9393
void file_close(file_handle_t fd) override;
9494
uint64_t file_size(file_handle_t fd) override;
9595
bool enqueue_readv(file_handle_t fd, void* buf, size_t len, uint64_t offset, completion_data* cd) override;
96-
bool enqueue_writev(file_handle_t fd, const void* buf, size_t len, uint64_t offset, completion_data* cd) override;
96+
bool enqueue_writev(file_handle_t fd, const void* buf, size_t len, uint64_t offset,
97+
completion_data* cd) override;
9798
bool enqueue_fsync(file_handle_t fd, fsync_flags flags, completion_data* cd) override;
9899

99100
bool cancel(completion_data* cd) override;
@@ -581,7 +582,8 @@ namespace asyncpp::io::detail {
581582
#endif
582583
}
583584

584-
bool io_engine_select::enqueue_readv(file_handle_t fd, void* buf, size_t len, uint64_t offset, completion_data* cd) {
585+
bool io_engine_select::enqueue_readv(file_handle_t fd, void* buf, size_t len, uint64_t offset,
586+
completion_data* cd) {
585587
// There is no way to do async file io on linux without uring, so just do the read inline
586588
auto res = pread(fd, buf, len, offset);
587589
if (res >= 0) {

‎src/io_engine_uring.cpp

+5-3
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ namespace asyncpp::io::detail {
66
} // namespace asyncpp::io::detail
77
#else
88

9-
#include <asm/unistd_64.h>
109
#include <cstring>
11-
#include <liburing.h>
1210
#include <mutex>
11+
12+
#include <asm/unistd_64.h>
13+
#include <liburing.h>
1314
#include <netinet/in.h>
1415
#include <sys/socket.h>
1516
#include <sys/time.h>
@@ -54,7 +55,8 @@ namespace asyncpp::io::detail {
5455
void file_close(file_handle_t fd) override;
5556
uint64_t file_size(file_handle_t fd) override;
5657
bool enqueue_readv(file_handle_t fd, void* buf, size_t len, uint64_t offset, completion_data* cd) override;
57-
bool enqueue_writev(file_handle_t fd, const void* buf, size_t len, uint64_t offset, completion_data* cd) override;
58+
bool enqueue_writev(file_handle_t fd, const void* buf, size_t len, uint64_t offset,
59+
completion_data* cd) override;
5860
bool enqueue_fsync(file_handle_t fd, fsync_flags flags, completion_data* cd) override;
5961

6062
bool cancel(completion_data* cd) override;

‎test/tls.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ TEST(ASYNCPP_IO, TLSRoundtrip) {
2020
std::cout.sync_with_stdio(true);
2121
// Generate cert if missing
2222
if (!std::filesystem::exists("ssl.crt") || !std::filesystem::exists("ssl.key")) {
23-
#ifdef _WIN32
23+
#ifdef _WIN32
2424
GTEST_SKIP() << "Can not generate certs on windows";
25-
#endif
25+
#endif
2626
std::cout << "Generating temporary cert..." << std::endl;
2727
system("openssl req -x509 -newkey rsa:2048 -keyout ssl.key -out ssl.crt -sha256 -days 2 -nodes -subj "
2828
"\"/C=XX/ST=StateName/L=SomeCity/O=ASYNCPP/OU=ASYNCPP-TEST/CN=server1\"");

0 commit comments

Comments
 (0)