weaselab/weaseldb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Match server's epoll usage a bit better

Browse Source
This commit is contained in:
Andrew Noyes
2025-08-20 10:57:04 -04:00
parent cf9598a568
commit 4b907819dc
1 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
tools/load_tester.cpp
View File

@@ -163,6 +163,8 @@ struct Connection {
initRequest(); initRequest();
} }
// Match server's connection state management
bool hasMessages() const { return !request.empty(); }
bool error = false; bool error = false;
~Connection() { ~Connection() {
@@ -321,7 +323,7 @@ int main() {
continue; continue;
} }
perror("epoll_wait"); perror("epoll_wait");
abort(); abort(); // Keep abort for critical errors like server does
} }
break; break;
} }
@@ -333,9 +335,9 @@ int main() {
events[i].data.ptr = nullptr; events[i].data.ptr = nullptr;
const int fd = conn->fd; const int fd = conn->fd;
if (events[i].events & EPOLLERR) { // Handle connection errors like server
// Done with connection if (events[i].events & (EPOLLERR | EPOLLHUP | EPOLLRDHUP)) {
continue; continue; // Let unique_ptr destructor clean up
} }
if (events[i].events & EPOLLOUT) { if (events[i].events & EPOLLOUT) {
bool finished = conn->writeBytes(); bool finished = conn->writeBytes();
@@ -363,17 +365,19 @@ int main() {
// Transfer back to epoll instance. This thread or another thread // Transfer back to epoll instance. This thread or another thread
// will wake when fd is ready // will wake when fd is ready
if (!conn->request.empty() && !conn->error) { if (conn->hasMessages()) {
events[i].events = EPOLLOUT | EPOLLONESHOT; events[i].events = EPOLLOUT | EPOLLONESHOT | EPOLLRDHUP;
} else { } else {
events[i].events = EPOLLIN | EPOLLONESHOT; events[i].events = EPOLLIN | EPOLLONESHOT | EPOLLRDHUP;
} }
conn->tsan_release(); conn->tsan_release();
events[i].data.ptr = conn.release(); Connection *raw_conn = conn.release();
events[i].data.ptr = raw_conn;
int e = epoll_ctl(epollfd, EPOLL_CTL_MOD, fd, &events[i]); int e = epoll_ctl(epollfd, EPOLL_CTL_MOD, fd, &events[i]);
if (e == -1) { if (e == -1) {
perror("epoll_ctl"); perror("epoll_ctl MOD");
abort(); delete raw_conn; // Clean up on failure like server
continue;
} }
} }
} }
@@ -395,17 +399,25 @@ int main() {
} }
// int fd = getConnectFd("127.0.0.1", "4569"); // int fd = getConnectFd("127.0.0.1", "4569");
int fd = getConnectFdUnix("weaseldb.sock"); int fd = getConnectFdUnix("weaseldb.sock");
if (fd == -1) {
continue; // Connection failed, try again
}
// Create connection with proper ownership like server
auto conn = std::make_unique<Connection>( auto conn = std::make_unique<Connection>(
fd, connectionId.fetch_add(1, std::memory_order_relaxed)); fd, connectionId.fetch_add(1, std::memory_order_relaxed));
// Post to epoll instance
// Add to epoll with proper events matching server pattern
struct epoll_event event{}; struct epoll_event event{};
event.events = EPOLLOUT | EPOLLONESHOT; event.events = EPOLLOUT | EPOLLONESHOT | EPOLLRDHUP;
conn->tsan_release(); conn->tsan_release();
event.data.ptr = conn.release(); Connection *raw_conn = conn.release();
event.data.ptr = raw_conn;
e = epoll_ctl(epollfd, EPOLL_CTL_ADD, fd, &event); e = epoll_ctl(epollfd, EPOLL_CTL_ADD, fd, &event);
if (e == -1) { if (e == -1) {
perror("epoll_ctl"); perror("epoll_ctl ADD");
abort(); delete raw_conn; // Clean up on failure like server
continue;
} }
} }
}); });