]> git.sesse.net Git - cubemap/blobdiff - server.cpp
Remove a no longer relevant TODO.
[cubemap] / server.cpp
index 25da16cba4c341e0c07b8d06eb4239a63a0f476c..2f3f4c091b96223088252d402aebd26bbd848218 100644 (file)
@@ -13,6 +13,7 @@
 #include <vector>
 #include <string>
 #include <map>
+#include <algorithm>
 
 #include "metacube.h"
 #include "server.h"
@@ -94,18 +95,39 @@ void Server::add_client(int sock)
        
 void Server::add_stream(const string &stream_id)
 {
-       // TODO
+       MutexLock lock(&mutex);
+       streams.insert(make_pair(stream_id, Stream()));
 }
        
 void Server::set_header(const string &stream_id, const string &header)
 {
-       // TODO
-       printf("got header! %lu bytes\n", header.size());
+       MutexLock lock(&mutex);
+       assert(streams.count(stream_id) != 0);
+       streams[stream_id].header = 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)
@@ -155,23 +177,106 @@ void Server::process_client(Client *client)
                        return;
                }
 
-               client->state = Client::SENDING_HEADER;
+               parse_request(client);
+               break;
+       }
+       case Client::SENDING_HEADER: {
+               int ret = write(client->sock,
+                               client->header.data() + client->header_bytes_sent,
+                               client->header.size() - client->header_bytes_sent);
+               if (ret == -1) {
+                       perror("write");
+                       close_client(client);
+                       return;
+               }
+               
+               client->header_bytes_sent += ret;
+               assert(client->header_bytes_sent <= client->header.size());
 
-               epoll_event ev;
-               ev.events = EPOLLOUT | EPOLLRDHUP;
-               ev.data.fd = client->sock;
+               if (client->header_bytes_sent < client->header.size()) {
+                       // We haven't sent all yet. Fine; we'll do that later.
+                       return;
+               }
 
-               if (epoll_ctl(epoll_fd, EPOLL_CTL_MOD, client->sock, &ev) == -1) {
-                       perror("epoll_ctl(EPOLL_CTL_MOD)");
-                       exit(1);
+               // We're done sending the header! Clear the entire header to release some memory.
+               client->header.clear();
+
+               // Start sending from the end. In other words, we won't send any of the backlog,
+               // 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
                assert(false);
        }
 }
+
+void Server::parse_request(Client *client)
+{
+       // TODO: Actually parse the request. :-)
+       client->stream_id = "stream";
+
+       // Construct the header.
+       client->header = "HTTP/1.0 200 OK\r\nContent-type: todo/fixme\r\n\r\n" +
+               streams[client->stream_id].header;
+
+       // Switch states.
+       client->state = Client::SENDING_HEADER;
+
+       epoll_event ev;
+       ev.events = EPOLLOUT | 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);
+       }
+}
        
 void Server::close_client(Client *client)
 {
@@ -179,8 +284,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();
+}