When closing a client, make sure it is not left in sleeping_clients.
[cubemap] / server.cpp
index 0b399e4893d25727cff6e3b723426758d89229c3..d894bd14d0a85d05783366fb60f0394fcf7c86dc 100644 (file)
@@ -13,6 +13,7 @@
 #include <vector>
 #include <string>
 #include <map>
+#include <algorithm>
 
 #include "metacube.h"
 #include "server.h"
@@ -107,7 +108,26 @@ void Server::set_header(const string &stream_id, const string &header)
        
 void Server::add_data(const string &stream_id, const char *data, size_t bytes)
 {
-       // TODO
+       if (bytes == 0) {
+               return;
+       }
+
+       MutexLock lock(&mutex);
+       assert(streams.count(stream_id) != 0);
+       Stream *stream = &streams[stream_id];
+       size_t pos = stream->data_size % BACKLOG_SIZE;
+       stream->data_size += bytes;
+
+       if (pos + bytes > BACKLOG_SIZE) {
+               size_t to_copy = BACKLOG_SIZE - pos;
+               memcpy(stream->data + pos, data, to_copy);
+               data += to_copy;
+               bytes -= to_copy;
+               pos = 0;
+       }
+
+       memcpy(stream->data + pos, data, bytes);
+       wake_up_all_clients();
 }
        
 void Server::process_client(Client *client)
@@ -185,6 +205,51 @@ void Server::process_client(Client *client)
                // but we'll start sending immediately as we get data.
                client->state = Client::SENDING_DATA;
                client->bytes_sent = streams[client->stream_id].data_size;
+               break;
+       }
+       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 = streams[client->stream_id];
+               size_t bytes_to_send = stream.data_size - client->bytes_sent;
+               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 = streams[client->stream_id].data_size - BACKLOG_SIZE;
+                       bytes_to_send = BACKLOG_SIZE;
+               }
+
+               // See if we need to split across the circular buffer.
+               ssize_t ret;
+               if ((client->bytes_sent % BACKLOG_SIZE) + bytes_to_send > BACKLOG_SIZE) {
+                       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_len = bytes_first_part;
+
+                       iov[1].iov_base = const_cast<char *>(stream.data);
+                       iov[1].iov_len = bytes_to_send - bytes_first_part;
+
+                       ret = writev(client->sock, iov, 2);
+               } else {
+                       ret = write(client->sock,
+                                   stream.data + (client->bytes_sent % BACKLOG_SIZE),
+                                   bytes_to_send);
+               }
+               if (ret == -1) {
+                       perror("write/writev");
+                       close_client(client);
+                       return;
+               }
+               client->bytes_sent += ret;
+
+               if (client->bytes_sent == stream.data_size) {
+                       // We don't have any more data for this client, so put it to sleep.
+                       put_client_to_sleep(client);
+               }
+               break;
        }
        default:
                // TODO
@@ -220,8 +285,41 @@ void Server::close_client(Client *client)
                perror("epoll_ctl(EPOLL_CTL_DEL)");
                exit(1);
        }
+
+       // This client could be sleeping, so we'll need to fix that. (Argh, O(n).)
+       vector<int>::iterator new_end =
+               remove(sleeping_clients.begin(), sleeping_clients.end(), client->sock);
+       sleeping_clients.erase(new_end, sleeping_clients.end());
        
        // Bye-bye!
        close(client->sock);
        clients.erase(client->sock);
 }
+       
+void Server::put_client_to_sleep(Client *client)
+{
+       epoll_event ev;
+       ev.events = EPOLLRDHUP;
+       ev.data.fd = client->sock;
+
+       if (epoll_ctl(epoll_fd, EPOLL_CTL_MOD, client->sock, &ev) == -1) {
+               perror("epoll_ctl(EPOLL_CTL_MOD)");
+               exit(1);
+       }
+
+       sleeping_clients.push_back(client->sock);
+}
+
+void Server::wake_up_all_clients()
+{
+       for (unsigned i = 0; i < sleeping_clients.size(); ++i) {
+               epoll_event ev;
+               ev.events = EPOLLOUT | EPOLLRDHUP;
+               ev.data.fd = sleeping_clients[i];
+               if (epoll_ctl(epoll_fd, EPOLL_CTL_MOD, sleeping_clients[i], &ev) == -1) {
+                       perror("epoll_ctl(EPOLL_CTL_MOD)");
+                       exit(1);
+               }
+       }
+       sleeping_clients.clear();
+}