From a1906d9fe3e565bbd874df72e8552fa7daf9fb9a Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Mon, 15 Apr 2013 10:36:33 +0200 Subject: [PATCH 1/1] Store the client pointer directly in the epoll structure, instead of doing a map lookup every time. Saves some CPU. --- server.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/server.cpp b/server.cpp index a11b55f..789d8ea 100644 --- a/server.cpp +++ b/server.cpp @@ -80,9 +80,7 @@ void Server::do_work() process_queued_data(); for (int i = 0; i < nfds; ++i) { - int fd = events[i].data.fd; - assert(clients.count(fd) != 0); - Client *client = &clients[fd]; + Client *client = reinterpret_cast(events[i].data.u64); if (events[i].events & (EPOLLERR | EPOLLRDHUP | EPOLLHUP)) { close_client(client); @@ -140,8 +138,7 @@ void Server::add_client(int sock) // Start listening on data from this socket. epoll_event ev; ev.events = EPOLLIN | EPOLLET | EPOLLRDHUP; - ev.data.u64 = 0; // Keep Valgrind happy. - ev.data.fd = sock; + ev.data.u64 = reinterpret_cast(&clients[sock]); if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, sock, &ev) == -1) { perror("epoll_ctl(EPOLL_CTL_ADD)"); exit(1); @@ -173,7 +170,7 @@ void Server::add_client_from_serialized(const ClientProto &client) ev.events = EPOLLOUT | EPOLLET | EPOLLRDHUP; } ev.data.u64 = 0; // Keep Valgrind happy. - ev.data.fd = client.sock(); + ev.data.u64 = reinterpret_cast(client_ptr); if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, client.sock(), &ev) == -1) { perror("epoll_ctl(EPOLL_CTL_ADD)"); exit(1); @@ -454,8 +451,7 @@ void Server::construct_header(Client *client) epoll_event ev; ev.events = EPOLLOUT | EPOLLET | EPOLLRDHUP; - ev.data.u64 = 0; // Keep Valgrind happy. - ev.data.fd = client->sock; + ev.data.u64 = reinterpret_cast(client); if (epoll_ctl(epoll_fd, EPOLL_CTL_MOD, client->sock, &ev) == -1) { perror("epoll_ctl(EPOLL_CTL_MOD)"); @@ -475,8 +471,7 @@ void Server::construct_error(Client *client, int error_code) epoll_event ev; ev.events = EPOLLOUT | EPOLLET | EPOLLRDHUP; - ev.data.u64 = 0; // Keep Valgrind happy. - ev.data.fd = client->sock; + ev.data.u64 = reinterpret_cast(client); if (epoll_ctl(epoll_fd, EPOLL_CTL_MOD, client->sock, &ev) == -1) { perror("epoll_ctl(EPOLL_CTL_MOD)"); -- 2.39.2