]> git.sesse.net Git - cubemap/blobdiff - server.cpp
Make backlog_size changeable across HUPs.
[cubemap] / server.cpp
index 60836a74ca52774855f80c2a3ce623545dbc534f..2c8661ab87395164033588669fac728f515ba556 100644 (file)
-#include <stdio.h>
-#include <string.h>
-#include <stdint.h>
 #include <assert.h>
-#include <arpa/inet.h>
-#include <curl/curl.h>
-#include <sys/socket.h>
+#include <errno.h>
 #include <pthread.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <sys/epoll.h>
-#include <errno.h>
-#include <vector>
-#include <string>
-#include <map>
+#include <sys/sendfile.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <time.h>
+#include <unistd.h>
 #include <algorithm>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
-#include "metacube.h"
-#include "server.h"
+#include "markpool.h"
 #include "mutexlock.h"
 #include "parse.h"
+#include "server.h"
 #include "state.pb.h"
+#include "stream.h"
 
 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, 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())
-{
-}
-
-ClientProto Client::serialize() const
-{
-       ClientProto serialized;
-       serialized.set_sock(sock);
-       serialized.set_state(state);
-       serialized.set_request(request);
-       serialized.set_stream_id(stream_id);
-       serialized.set_header_or_error(header_or_error);
-       serialized.set_header_or_error_bytes_sent(serialized.header_or_error_bytes_sent());
-       serialized.set_bytes_sent(bytes_sent);
-       return serialized;
-}
-
-Stream::Stream(const string &stream_id)
-       : stream_id(stream_id),
-         data(new char[BACKLOG_SIZE]),
-         data_size(0)
-{
-       memset(data, 0, BACKLOG_SIZE);
-}
-
-Stream::~Stream()
-{
-       delete[] data;
-}
-
-Stream::Stream(const StreamProto &serialized)
-       : stream_id(serialized.stream_id()),
-         header(serialized.header()),
-         data(new char[BACKLOG_SIZE]),
-         data_size(serialized.data_size())
-{
-       assert(serialized.data().size() == BACKLOG_SIZE);
-       memcpy(data, serialized.data().data(), BACKLOG_SIZE);
-}
-
-StreamProto Stream::serialize() const
-{
-       StreamProto serialized;
-       serialized.set_header(header);
-       serialized.set_data(string(data, data + BACKLOG_SIZE));
-       serialized.set_data_size(data_size);
-       serialized.set_stream_id(stream_id);
-       return serialized;
-}
-
-void Stream::put_client_to_sleep(Client *client)
-{
-       sleeping_clients.push_back(client);
-}
-
-void Stream::wake_up_all_clients()
-{
-       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();
-       }
-}
-
 Server::Server()
 {
        pthread_mutex_init(&mutex, NULL);
@@ -130,35 +48,17 @@ Server::~Server()
        }
 }
 
-void Server::run()
+vector<ClientStats> Server::get_client_stats() const
 {
-       should_stop = false;
-       
-       // Joinable is already the default, but it's good to be certain.
-       pthread_attr_t attr;
-       pthread_attr_init(&attr);
-       pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
-       pthread_create(&worker_thread, &attr, Server::do_work_thunk, this);
-}
-       
-void Server::stop()
-{
-       {
-               MutexLock lock(&mutex);
-               should_stop = true;
-       }
+       vector<ClientStats> ret;
 
-       if (pthread_join(worker_thread, NULL) == -1) {
-               perror("pthread_join");
-               exit(1);
+       MutexLock lock(&mutex);
+       for (map<int, Client>::const_iterator client_it = clients.begin();
+            client_it != clients.end();
+            ++client_it) {
+               ret.push_back(client_it->second.get_stats());
        }
-}
-
-void *Server::do_work_thunk(void *arg)
-{
-       Server *server = static_cast<Server *>(arg);
-       server->do_work();
-       return NULL;
+       return ret;
 }
 
 void Server::do_work()
@@ -166,6 +66,9 @@ void Server::do_work()
        for ( ;; ) {
                int nfds = epoll_wait(epoll_fd, events, EPOLL_MAX_EVENTS, EPOLL_TIMEOUT_MS);
                if (nfds == -1 && errno == EINTR) {
+                       if (should_stop) {
+                               return;
+                       }
                        continue;
                }
                if (nfds == -1) {
@@ -175,10 +78,6 @@ void Server::do_work()
 
                MutexLock lock(&mutex);  // We release the mutex between iterations.
        
-               if (should_stop) {
-                       return;
-               }
-
                process_queued_data();
 
                for (int i = 0; i < nfds; ++i) {
@@ -197,11 +96,15 @@ void Server::do_work()
                for (map<string, Stream *>::iterator stream_it = streams.begin();
                     stream_it != streams.end();
                     ++stream_it) {
-                       Stream *stream = stream_it->second;
-                       for (size_t i = 0; i < stream->to_process.size(); ++i) {
-                               process_client(stream->to_process[i]);
+                       vector<Client *> to_process;
+                       swap(stream_it->second->to_process, to_process);
+                       for (size_t i = 0; i < to_process.size(); ++i) {
+                               process_client(to_process[i]);
                        }
-                       stream->to_process.clear();
+               }
+
+               if (should_stop) {
+                       return;
                }
        }
 }
@@ -272,17 +175,17 @@ void Server::add_client_from_serialized(const ClientProto &client)
        }
 
        if (client_ptr->state == Client::SENDING_DATA && 
-           client_ptr->bytes_sent == client_ptr->stream->data_size) {
+           client_ptr->bytes_sent == client_ptr->stream->bytes_received) {
                client_ptr->stream->put_client_to_sleep(client_ptr);
        } else {
                process_client(client_ptr);
        }
 }
 
-void Server::add_stream(const string &stream_id)
+void Server::add_stream(const string &stream_id, size_t backlog_size)
 {
        MutexLock lock(&mutex);
-       streams.insert(make_pair(stream_id, new Stream(stream_id)));
+       streams.insert(make_pair(stream_id, new Stream(stream_id, backlog_size)));
 }
 
 void Server::add_stream_from_serialized(const StreamProto &stream)
@@ -291,6 +194,13 @@ void Server::add_stream_from_serialized(const StreamProto &stream)
        streams.insert(make_pair(stream.stream_id(), new Stream(stream)));
 }
        
+void Server::set_backlog_size(const std::string &stream_id, size_t new_size)
+{
+       MutexLock lock(&mutex);
+       assert(streams.count(stream_id) != 0);
+       streams[stream_id]->set_backlog_size(new_size);
+}
+       
 void Server::set_header(const string &stream_id, const string &header)
 {
        MutexLock lock(&mutex);
@@ -308,6 +218,13 @@ void Server::set_header(const string &stream_id, const string &header)
                }
        }
 }
+       
+void Server::set_mark_pool(const std::string &stream_id, MarkPool *mark_pool)
+{
+       MutexLock lock(&mutex);
+       assert(clients.empty());
+       find_stream(stream_id)->mark_pool = mark_pool;
+}
 
 void Server::add_data_deferred(const string &stream_id, const char *data, size_t bytes)
 {
@@ -315,24 +232,6 @@ void Server::add_data_deferred(const string &stream_id, const char *data, size_t
        queued_data[stream_id].append(string(data, data + bytes));
 }
 
-void Server::add_data(const string &stream_id, const char *data, size_t bytes)
-{
-       Stream *stream = find_stream(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);
-       stream->wake_up_all_clients();
-}
-
 // See the .h file for postconditions after this function.     
 void Server::process_client(Client *client)
 {
@@ -362,34 +261,27 @@ read_request_again:
                        return;
                }
 
-               // Guard against overlong requests gobbling up all of our space.
-               if (client->request.size() + ret > MAX_CLIENT_REQUEST) {
+               RequestParseStatus status = wait_for_double_newline(&client->request, buf, ret);
+       
+               switch (status) {
+               case RP_OUT_OF_SPACE:
                        fprintf(stderr, "WARNING: fd %d sent overlong request!\n", client->sock);
                        close_client(client);
                        return;
-               }       
-
-               // See if we have \r\n\r\n anywhere in the request. We start three bytes
-               // before what we just appended, in case we just got the final character.
-               size_t existing_req_bytes = client->request.size();
-               client->request.append(string(buf, buf + ret));
-       
-               size_t start_at = (existing_req_bytes >= 3 ? existing_req_bytes - 3 : 0);
-               const char *ptr = reinterpret_cast<char *>(
-                       memmem(client->request.data() + start_at, client->request.size() - start_at,
-                              "\r\n\r\n", 4));
-               if (ptr == NULL) {
+               case RP_NOT_FINISHED_YET:
                        // OK, we don't have the entire header yet. Fine; we'll get it later.
                        // See if there's more data for us.
                        goto read_request_again;
-               }
-
-               if (ptr != client->request.data() + client->request.size() - 4) {
+               case RP_EXTRA_DATA:
                        fprintf(stderr, "WARNING: fd %d had junk data after request!\n", client->sock);
                        close_client(client);
                        return;
+               case RP_FINISHED:
+                       break;
                }
 
+               assert(status == RP_FINISHED);
+
                int error_code = parse_request(client);
                if (error_code == 200) {
                        construct_header(client);
@@ -448,48 +340,40 @@ 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 = client->stream->data_size;
+               client->bytes_sent = client->stream->bytes_received;
                client->stream->put_client_to_sleep(client);
                return;
        }
        case Client::SENDING_DATA: {
+sending_data_again:
                // 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.
                Stream *stream = client->stream;
-               size_t bytes_to_send = stream->data_size - client->bytes_sent;
+               size_t bytes_to_send = stream->bytes_received - client->bytes_sent;
                if (bytes_to_send == 0) {
                        return;
                }
-               if (bytes_to_send > BACKLOG_SIZE) {
+               if (bytes_to_send > stream->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 = stream->data_size - BACKLOG_SIZE;
-                       bytes_to_send = BACKLOG_SIZE;
+                               (long long int)(bytes_to_send - stream->backlog_size));
+                       client->bytes_sent = stream->bytes_received - stream->backlog_size;
+                       bytes_to_send = stream->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;
+               bool more_data = false;
+               if ((client->bytes_sent % stream->backlog_size) + bytes_to_send > stream->backlog_size) {
+                       bytes_to_send = stream->backlog_size - (client->bytes_sent % stream->backlog_size);
+                       more_data = true;
+               }
 
-                       iov[1].iov_base = const_cast<char *>(stream->data);
-                       iov[1].iov_len = bytes_to_send - bytes_first_part;
+               ssize_t ret;
+               do {
+                       loff_t offset = client->bytes_sent % stream->backlog_size;
+                       ret = sendfile(client->sock, stream->data_fd, &offset, bytes_to_send);
+               } while (ret == -1 && errno == EINTR);
 
-                       do {
-                               ret = writev(client->sock, iov, 2);
-                       } while (ret == -1 && errno == EINTR);
-               } else {
-                       do {
-                               ret = write(client->sock,
-                                           stream->data + (client->bytes_sent % BACKLOG_SIZE),
-                                           bytes_to_send);
-                       } while (ret == -1 && errno == EINTR);
-               }
                if (ret == -1 && errno == EAGAIN) {
                        // We're out of socket space, so return; epoll will wake us up
                        // when there is more room.
@@ -498,19 +382,18 @@ sending_header_or_error_again:
                }
                if (ret == -1) {
                        // Error, close; postcondition #1.
-                       perror("write/writev");
+                       perror("sendfile");
                        close_client(client);
                        return;
                }
                client->bytes_sent += ret;
 
-               if (client->bytes_sent == stream->data_size) {
+               if (client->bytes_sent == 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 {
-                       // XXX: Do we need to go another round here to explicitly
-                       // get the EAGAIN?
+               } else if (more_data) {
+                       goto sending_data_again;
                }
                break;
        }
@@ -539,6 +422,16 @@ int Server::parse_request(Client *client)
 
        client->stream_id = request_tokens[1];
        client->stream = find_stream(client->stream_id);
+       if (client->stream->mark_pool != NULL) {
+               client->fwmark = client->stream->mark_pool->get_mark();
+       } else {
+               client->fwmark = 0;  // No mark.
+       }
+       if (setsockopt(client->sock, SOL_SOCKET, SO_MARK, &client->fwmark, sizeof(client->fwmark)) == -1) {                          
+               if (client->fwmark != 0) {
+                       perror("setsockopt(SO_MARK)");
+               }
+       }
        client->request.clear();
 
        return 200;  // OK!
@@ -546,8 +439,7 @@ int Server::parse_request(Client *client)
 
 void Server::construct_header(Client *client)
 {
-       client->header_or_error = "HTTP/1.0 200 OK\r\nContent-type: video/x-flv\r\nCache-Control: no-cache\r\n\r\n" +
-               find_stream(client->stream_id)->header;
+       client->header_or_error = find_stream(client->stream_id)->header;
 
        // Switch states.
        client->state = Client::SENDING_HEADER;
@@ -583,6 +475,13 @@ void Server::construct_error(Client *client, int error_code)
                exit(1);
        }
 }
+
+template<class T>
+void delete_from(vector<T> *v, T elem)
+{
+       typename vector<T>::iterator new_end = remove(v->begin(), v->end(), elem);
+       v->erase(new_end, v->end());
+}
        
 void Server::close_client(Client *client)
 {
@@ -593,14 +492,14 @@ void Server::close_client(Client *client)
 
        // This client could be sleeping, so we'll need to fix that. (Argh, O(n).)
        if (client->stream != NULL) {
-               vector<Client *>::iterator new_end =
-                       remove(client->stream->sleeping_clients.begin(),
-                              client->stream->sleeping_clients.end(),
-                              client);
-               client->stream->sleeping_clients.erase(
-                       new_end, client->stream->sleeping_clients.end());
+               delete_from(&client->stream->sleeping_clients, client);
+               delete_from(&client->stream->to_process, client);
+               if (client->stream->mark_pool != NULL) {
+                       int fwmark = client->fwmark;
+                       client->stream->mark_pool->release_mark(fwmark);
+               }
        }
-       
+
        // Bye-bye!
        int ret;
        do {
@@ -633,7 +532,9 @@ void Server::process_queued_data()
        for (map<string, string>::iterator queued_it = queued_data.begin();
             queued_it != queued_data.end();
             ++queued_it) {
-               add_data(queued_it->first, queued_it->second.data(), queued_it->second.size());
+               Stream *stream = find_stream(queued_it->first);
+               stream->add_data(queued_it->second.data(), queued_it->second.size());
+               stream->wake_up_all_clients();
        }
        queued_data.clear();
 }