Add ConnectionHandler::on_post_batch
This commit is contained in:
@@ -51,6 +51,7 @@ struct Connection {
|
||||
}
|
||||
return result;
|
||||
}
|
||||
void *user_data = nullptr;
|
||||
|
||||
// Note: To release connection back to server, use
|
||||
// Server::releaseBackToServer(std::move(connection_ptr))
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <memory>
|
||||
#include <span>
|
||||
#include <string_view>
|
||||
|
||||
// Forward declaration to avoid circular dependency
|
||||
@@ -68,4 +69,17 @@ public:
|
||||
* @note May be called from an arbitrary accept thread.
|
||||
*/
|
||||
virtual void on_connection_closed(Connection &) {}
|
||||
|
||||
/**
|
||||
* @brief Called after a batch of connections has been processed.
|
||||
*
|
||||
* This hook is called after on_data_arrived or on_write_progress has been
|
||||
* called for each connection in the batch. The handler can take ownership of
|
||||
* the connections by moving the unique_ptr out of the span. Any connections
|
||||
* left in the span will remain owned by the server.
|
||||
*
|
||||
* @param batch A span of unique_ptrs to the connections in the batch.
|
||||
*/
|
||||
virtual void on_post_batch(std::span<std::unique_ptr<Connection>> /*batch*/) {
|
||||
}
|
||||
};
|
||||
|
||||
@@ -228,10 +228,11 @@ void Server::start_network_threads() {
|
||||
pthread_setname_np(pthread_self(),
|
||||
("network-" + std::to_string(thread_id)).c_str());
|
||||
|
||||
std::vector<struct epoll_event> events(config_.server.event_batch_size);
|
||||
struct epoll_event events[config_.server.event_batch_size];
|
||||
std::unique_ptr<Connection> batch[config_.server.event_batch_size];
|
||||
|
||||
for (;;) {
|
||||
int event_count = epoll_wait(network_epollfd_, events.data(),
|
||||
int event_count = epoll_wait(network_epollfd_, events,
|
||||
config_.server.event_batch_size, -1);
|
||||
if (event_count == -1) {
|
||||
if (errno == EINTR) {
|
||||
@@ -241,6 +242,7 @@ void Server::start_network_threads() {
|
||||
abort();
|
||||
}
|
||||
|
||||
int batch_count = 0;
|
||||
for (int i = 0; i < event_count; ++i) {
|
||||
// Check for shutdown event
|
||||
if (events[i].data.fd == shutdown_pipe_[0]) {
|
||||
@@ -252,7 +254,6 @@ void Server::start_network_threads() {
|
||||
static_cast<Connection *>(events[i].data.ptr)};
|
||||
conn->tsan_acquire();
|
||||
events[i].data.ptr = nullptr;
|
||||
const int fd = conn->getFd();
|
||||
|
||||
if (events[i].events & (EPOLLERR | EPOLLHUP | EPOLLRDHUP)) {
|
||||
continue; // Connection closed - unique_ptr destructor cleans up
|
||||
@@ -299,21 +300,31 @@ void Server::start_network_threads() {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
batch[batch_count++] = std::move(conn);
|
||||
}
|
||||
|
||||
handler_.on_post_batch({batch, (size_t)batch_count});
|
||||
|
||||
for (int i = 0; i < batch_count; ++i) {
|
||||
auto &conn = batch[i];
|
||||
if (!conn) {
|
||||
continue;
|
||||
}
|
||||
// Determine next epoll interest
|
||||
struct epoll_event event{};
|
||||
if (!conn->hasMessages()) {
|
||||
events[i].events = EPOLLIN | EPOLLONESHOT | EPOLLRDHUP;
|
||||
event.events = EPOLLIN | EPOLLONESHOT | EPOLLRDHUP;
|
||||
} else {
|
||||
events[i].events = EPOLLOUT | EPOLLONESHOT | EPOLLRDHUP;
|
||||
event.events = EPOLLOUT | EPOLLONESHOT | EPOLLRDHUP;
|
||||
}
|
||||
|
||||
// Transfer ownership back to epoll
|
||||
conn->tsan_release();
|
||||
Connection *raw_conn = conn.release();
|
||||
events[i].data.ptr = raw_conn;
|
||||
event.data.ptr = raw_conn;
|
||||
|
||||
if (epoll_ctl(network_epollfd_, EPOLL_CTL_MOD, fd, &events[i]) ==
|
||||
-1) {
|
||||
if (epoll_ctl(network_epollfd_, EPOLL_CTL_MOD, raw_conn->getFd(),
|
||||
&event) == -1) {
|
||||
perror("epoll_ctl MOD");
|
||||
delete raw_conn;
|
||||
continue;
|
||||
|
||||
Reference in New Issue
Block a user