X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=server.cpp;h=6d5cce372ae9c79b81b4b755052252680ce3cf28;hb=5179ad190827a75ee096f2cc92d3f0d8837eff72;hp=8c3382d4e8c6506d4c6a99aa686c2bc5121fa436;hpb=32596aa52effed323ae434b44ac9d915a2c4cf61;p=cubemap diff --git a/server.cpp b/server.cpp index 8c3382d..6d5cce3 100644 --- a/server.cpp +++ b/server.cpp @@ -1,8 +1,11 @@ #include #include +#include #include +#include #include #include +#include #include #include #include @@ -17,11 +20,13 @@ #include "accesslog.h" #include "log.h" #include "markpool.h" +#include "metacube.h" #include "mutexlock.h" #include "parse.h" #include "server.h" #include "state.pb.h" #include "stream.h" +#include "util.h" using namespace std; @@ -47,14 +52,7 @@ Server::~Server() delete stream_it->second; } - int ret; - do { - ret = close(epoll_fd); - } while (ret == -1 && errno == EINTR); - - if (ret == -1) { - log_perror("close(epoll_fd)"); - } + safe_close(epoll_fd); } vector Server::get_client_stats() const @@ -72,15 +70,17 @@ vector Server::get_client_stats() const 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) { + while (!should_stop()) { + // Wait until there's activity on at least one of the fds, + // or 20 ms (about one frame at 50 fps) has elapsed. + // + // We could in theory wait forever and rely on wakeup() + // from add_client_deferred() and add_data_deferred(), + // but wakeup is a pretty expensive operation, and the + // two threads might end up fighting over a lock, so it's + // seemingly (much) more efficient to just have a timeout here. + int nfds = epoll_pwait(epoll_fd, events, EPOLL_MAX_EVENTS, EPOLL_TIMEOUT_MS, &sigset_without_usr1_block); + if (nfds == -1 && errno != EINTR) { log_perror("epoll_wait"); exit(1); } @@ -109,10 +109,6 @@ void Server::do_work() process_client(to_process[i]); } } - - if (should_stop) { - return; - } } } @@ -143,18 +139,21 @@ void Server::add_client_deferred(int sock) void Server::add_client(int sock) { - clients.insert(make_pair(sock, Client(sock))); + pair::iterator, bool> ret = + clients.insert(make_pair(sock, Client(sock))); + assert(ret.second == true); // Should not already exist. + Client *client_ptr = &ret.first->second; // Start listening on data from this socket. epoll_event ev; ev.events = EPOLLIN | EPOLLET | EPOLLRDHUP; - ev.data.u64 = reinterpret_cast(&clients[sock]); + ev.data.u64 = reinterpret_cast(client_ptr); if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, sock, &ev) == -1) { log_perror("epoll_ctl(EPOLL_CTL_ADD)"); exit(1); } - process_client(&clients[sock]); + process_client(client_ptr); } void Server::add_client_from_serialized(const ClientProto &client) @@ -167,8 +166,10 @@ void Server::add_client_from_serialized(const ClientProto &client) } else { stream = stream_it->second; } - clients.insert(make_pair(client.sock(), Client(client, stream))); - Client *client_ptr = &clients[client.sock()]; + pair::iterator, bool> ret = + clients.insert(make_pair(client.sock(), Client(client, stream))); + assert(ret.second == true); // Should not already exist. + Client *client_ptr = &ret.first->second; // Start listening on data from this socket. epoll_event ev; @@ -194,29 +195,37 @@ void Server::add_client_from_serialized(const ClientProto &client) } } -void Server::add_stream(const string &stream_id, size_t backlog_size) +void Server::add_stream(const string &stream_id, size_t backlog_size, Stream::Encoding encoding) { MutexLock lock(&mutex); - streams.insert(make_pair(stream_id, new Stream(stream_id, backlog_size))); + streams.insert(make_pair(stream_id, new Stream(stream_id, backlog_size, encoding))); } -void Server::add_stream_from_serialized(const StreamProto &stream) +void Server::add_stream_from_serialized(const StreamProto &stream, int data_fd) { MutexLock lock(&mutex); - streams.insert(make_pair(stream.stream_id(), new Stream(stream))); + streams.insert(make_pair(stream.stream_id(), new Stream(stream, data_fd))); } -void Server::set_backlog_size(const std::string &stream_id, size_t new_size) +void Server::set_backlog_size(const 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) +void Server::set_encoding(const string &stream_id, Stream::Encoding encoding) +{ + MutexLock lock(&mutex); + assert(streams.count(stream_id) != 0); + streams[stream_id]->encoding = encoding; +} + +void Server::set_header(const string &stream_id, const string &http_header, const string &stream_header) { MutexLock lock(&mutex); - find_stream(stream_id)->header = header; + find_stream(stream_id)->http_header = http_header; + find_stream(stream_id)->stream_header = stream_header; // If there are clients we haven't sent anything to yet, we should give // them the header, so push back into the SENDING_HEADER state. @@ -231,7 +240,7 @@ void Server::set_header(const string &stream_id, const string &header) } } -void Server::set_mark_pool(const std::string &stream_id, MarkPool *mark_pool) +void Server::set_mark_pool(const string &stream_id, MarkPool *mark_pool) { MutexLock lock(&mutex); assert(clients.empty()); @@ -366,13 +375,17 @@ sending_data_again: return; } if (bytes_to_send > stream->backlog_size) { - log(WARNING, "[%s] Client lost %lld bytes, maybe too slow connection", - client->remote_addr.c_str(), - (long long int)(bytes_to_send - stream->backlog_size)); + size_t bytes_lost = 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->bytes_lost += bytes_lost; ++client->num_loss_events; bytes_to_send = stream->backlog_size; + + double loss_fraction = double(client->bytes_lost) / double(client->bytes_lost + client->bytes_sent); + log(WARNING, "[%s] Client lost %lld bytes (total loss: %.2f%%), maybe too slow connection", + client->remote_addr.c_str(), + (long long int)(bytes_lost), + 100.0 * loss_fraction); } // See if we need to split across the circular buffer. @@ -454,7 +467,27 @@ int Server::parse_request(Client *client) void Server::construct_header(Client *client) { - client->header_or_error = find_stream(client->stream_id)->header; + Stream *stream = find_stream(client->stream_id); + if (stream->encoding == Stream::STREAM_ENCODING_RAW) { + client->header_or_error = stream->http_header + + "\r\n" + + stream->stream_header; + } else if (stream->encoding == Stream::STREAM_ENCODING_METACUBE) { + client->header_or_error = stream->http_header + + "Content-encoding: metacube\r\n" + + "\r\n"; + if (!stream->stream_header.empty()) { + metacube_block_header hdr; + memcpy(hdr.sync, METACUBE_SYNC, sizeof(hdr.sync)); + hdr.size = htonl(stream->stream_header.size()); + hdr.flags = htonl(METACUBE_FLAGS_HEADER); + client->header_or_error.append( + string(reinterpret_cast(&hdr), sizeof(hdr))); + } + client->header_or_error.append(stream->stream_header); + } else { + assert(false); + } // Switch states. client->state = Client::SENDING_HEADER; @@ -517,14 +550,7 @@ void Server::close_client(Client *client) access_log->write(client->get_stats()); // Bye-bye! - int ret; - do { - ret = close(client->sock); - } while (ret == -1 && errno == EINTR); - - if (ret == -1) { - log_perror("close"); - } + safe_close(client->sock); clients.erase(client->sock); }