Store the client pointer directly in the epoll structure, instead of doing a map...

[cubemap] / server.cpp

diff --git a/server.cpp b/server.cpp
index 9517b5480e5f55ce6c5decee9ab6ad726edf3167..789d8eabd14c88c67524b632b7dbe1debbe410fd 100644 (file)
--- 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<Client *>(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<uint64_t>(&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<uint64_t>(client_ptr);
        if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, client.sock(), &ev) == -1) {
                perror("epoll_ctl(EPOLL_CTL_ADD)");
                exit(1);
@@ -363,6 +360,8 @@ sending_data_again:
                                client->sock,
                                (long long int)(bytes_to_send - stream->backlog_size));
                        client->stream_pos = stream->bytes_received - stream->backlog_size;
+                       client->bytes_lost += bytes_to_send - stream->backlog_size;
+                       ++client->num_loss_events;
                        bytes_to_send = stream->backlog_size;
                }
 
@@ -392,12 +391,13 @@ sending_data_again:
                        return;
                }
                client->stream_pos += ret;
+               client->bytes_sent += ret;
 
                if (client->stream_pos == stream->bytes_received) {
                        // We don't have any more data for this client, so put it to sleep.
                        // This is postcondition #3.
                        stream->put_client_to_sleep(client);
-               } else if (more_data) {
+               } else if (more_data && ret == bytes_to_send) {
                        goto sending_data_again;
                }
                break;
@@ -451,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<uint64_t>(client);
 
        if (epoll_ctl(epoll_fd, EPOLL_CTL_MOD, client->sock, &ev) == -1) {
                perror("epoll_ctl(EPOLL_CTL_MOD)");
@@ -472,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<uint64_t>(client);
 
        if (epoll_ctl(epoll_fd, EPOLL_CTL_MOD, client->sock, &ev) == -1) {
                perror("epoll_ctl(EPOLL_CTL_MOD)");