If accept() fails, do not take down the entire thing; it could be a transient error...

[cubemap] / server.cpp

diff --git a/server.cpp b/server.cpp
index c8d688996bfa5dcbc48870b98430c7d8d18e3813..d41e3c70730b896e44a9362bf150ae534ee9f892 100644 (file)
--- a/server.cpp
+++ b/server.cpp
@@ -26,17 +26,19 @@ using namespace std;
 Client::Client(int sock)
        : sock(sock),
          state(Client::READING_REQUEST),
+         stream(NULL),
          header_or_error_bytes_sent(0),
          bytes_sent(0)
 {
        request.reserve(1024);
 }
        
-Client::Client(const ClientProto &serialized)
+Client::Client(const ClientProto &serialized, Stream *stream)
        : sock(serialized.sock()),
          state(State(serialized.state())),
          request(serialized.request()),
          stream_id(serialized.stream_id()),
+         stream(stream),
          header_or_error(serialized.header_or_error()),
          header_or_error_bytes_sent(serialized.header_or_error_bytes_sent()),
          bytes_sent(serialized.bytes_sent())
@@ -160,7 +162,7 @@ void Server::do_work()
                if (should_stop) {
                        return;
                }
-       
+
                for (int i = 0; i < nfds; ++i) {
                        int fd = events[i].data.fd;
                        assert(clients.count(fd) != 0);
@@ -173,6 +175,11 @@ void Server::do_work()
 
                        process_client(client);
                }
+
+               for (unsigned i = 0; i < to_process.size(); ++i) {
+                       process_client(to_process[i]);
+               }
+               to_process.clear();
        }
 }
 
@@ -199,19 +206,23 @@ void Server::add_client(int sock)
 
        // Start listening on data from this socket.
        epoll_event ev;
-       ev.events = EPOLLIN | EPOLLRDHUP;
+       ev.events = EPOLLIN | EPOLLET | EPOLLRDHUP;
        ev.data.u64 = 0;  // Keep Valgrind happy.
        ev.data.fd = sock;
        if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, sock, &ev) == -1) {
                perror("epoll_ctl(EPOLL_CTL_ADD)");
                exit(1);
        }
+
+       process_client(&clients[sock]);
 }
 
 void Server::add_client_from_serialized(const ClientProto &client)
 {
        MutexLock lock(&mutex);
-       clients.insert(make_pair(client.sock(), Client(client)));
+       Stream *stream = find_stream(client.stream_id());
+       clients.insert(make_pair(client.sock(), Client(client, stream)));
+       Client *client_ptr = &clients[client.sock()];
 
        // Start listening on data from this socket.
        epoll_event ev;
@@ -228,6 +239,13 @@ void Server::add_client_from_serialized(const ClientProto &client)
                perror("epoll_ctl(EPOLL_CTL_ADD)");
                exit(1);
        }
+
+       if (client_ptr->state == Client::SENDING_DATA && 
+           client_ptr->bytes_sent == client_ptr->stream->data_size) {
+               put_client_to_sleep(client_ptr);
+       } else {
+               process_client(client_ptr);
+       }
 }
 
 void Server::add_stream(const string &stream_id)
@@ -398,20 +416,23 @@ sending_header_or_error_again:
                // but we'll start sending immediately as we get data.
                // This is postcondition #3.
                client->state = Client::SENDING_DATA;
-               client->bytes_sent = find_stream(client->stream_id)->data_size;
-               sleeping_clients.push_back(client);
+               client->bytes_sent = client->stream->data_size;
+               put_client_to_sleep(client);
                return;
        }
        case Client::SENDING_DATA: {
                // See if there's some data we've lost. Ideally, we should drop to a block boundary,
                // but resync will be the mux's problem.
-               const Stream &stream = *find_stream(client->stream_id);
-               size_t bytes_to_send = stream.data_size - client->bytes_sent;
+               const Stream *stream = client->stream;
+               size_t bytes_to_send = stream->data_size - client->bytes_sent;
+               if (bytes_to_send == 0) {
+                       return;
+               }
                if (bytes_to_send > BACKLOG_SIZE) {
                        fprintf(stderr, "WARNING: fd %d lost %lld bytes, maybe too slow connection\n",
                                client->sock,
                                (long long int)(bytes_to_send - BACKLOG_SIZE));
-                       client->bytes_sent = find_stream(client->stream_id)->data_size - BACKLOG_SIZE;
+                       client->bytes_sent = stream->data_size - BACKLOG_SIZE;
                        bytes_to_send = BACKLOG_SIZE;
                }
 
@@ -421,10 +442,10 @@ sending_header_or_error_again:
                        size_t bytes_first_part = BACKLOG_SIZE - (client->bytes_sent % BACKLOG_SIZE);
 
                        iovec iov[2];
-                       iov[0].iov_base = const_cast<char *>(stream.data + (client->bytes_sent % BACKLOG_SIZE));
+                       iov[0].iov_base = const_cast<char *>(stream->data + (client->bytes_sent % BACKLOG_SIZE));
                        iov[0].iov_len = bytes_first_part;
 
-                       iov[1].iov_base = const_cast<char *>(stream.data);
+                       iov[1].iov_base = const_cast<char *>(stream->data);
                        iov[1].iov_len = bytes_to_send - bytes_first_part;
 
                        do {
@@ -433,7 +454,7 @@ sending_header_or_error_again:
                } else {
                        do {
                                ret = write(client->sock,
-                                           stream.data + (client->bytes_sent % BACKLOG_SIZE),
+                                           stream->data + (client->bytes_sent % BACKLOG_SIZE),
                                            bytes_to_send);
                        } while (ret == -1 && errno == EINTR);
                }
@@ -451,7 +472,7 @@ sending_header_or_error_again:
                }
                client->bytes_sent += ret;
 
-               if (client->bytes_sent == stream.data_size) {
+               if (client->bytes_sent == stream->data_size) {
                        // We don't have any more data for this client, so put it to sleep.
                        // This is postcondition #3.
                        put_client_to_sleep(client);
@@ -485,6 +506,7 @@ int Server::parse_request(Client *client)
        }
 
        client->stream_id = request_tokens[1];
+       client->stream = find_stream(client->stream_id);
        client->request.clear();
 
        return 200;  // OK!
@@ -562,10 +584,11 @@ void Server::put_client_to_sleep(Client *client)
 
 void Server::wake_up_all_clients()
 {
-       vector<Client *> to_process;
-       swap(sleeping_clients, to_process);
-       for (unsigned i = 0; i < to_process.size(); ++i) {
-               process_client(to_process[i]);
+       if (to_process.empty()) {
+               swap(sleeping_clients, to_process);
+       } else {
+               to_process.insert(to_process.end(), sleeping_clients.begin(), sleeping_clients.end());
+               sleeping_clients.clear();
        }
 }