X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.cpp;h=e91ba395ed6e2efa3c106fabf98ffa9756e159ef;hp=3e639cf7455a470d45072992cb7efd20eeaf30f9;hb=9b565a9e6e66f076abb7266b2c2f015f585fa9cb;hpb=9a066c8156cf5e8fa335d00de649f02549483495 diff --git a/server.cpp b/server.cpp index 3e639cf..e91ba39 100644 --- a/server.cpp +++ b/server.cpp @@ -3,7 +3,6 @@ #include #include #include -#include #include #include #include @@ -26,17 +25,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()) @@ -89,9 +90,25 @@ StreamProto Stream::serialize() const 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); + pthread_mutex_init(&queued_data_mutex, NULL); epoll_fd = epoll_create(1024); // Size argument is ignored. if (epoll_fd == -1) { @@ -160,7 +177,9 @@ void Server::do_work() if (should_stop) { return; } - + + process_queued_data(); + for (int i = 0; i < nfds; ++i) { int fd = events[i].data.fd; assert(clients.count(fd) != 0); @@ -173,11 +192,24 @@ void Server::do_work() process_client(client); } + + for (map::iterator stream_it = streams.begin(); + stream_it != streams.end(); + ++stream_it) { + vector 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]); + } + } } } -CubemapStateProto Server::serialize() const +CubemapStateProto Server::serialize() { + // We don't serialize anything queued, so empty the queues. + process_queued_data(); + CubemapStateProto serialized; for (map::const_iterator client_it = clients.begin(); client_it != clients.end(); @@ -192,35 +224,44 @@ CubemapStateProto Server::serialize() const return serialized; } +void Server::add_client_deferred(int sock) +{ + MutexLock lock(&queued_data_mutex); + queued_add_clients.push_back(sock); +} + void Server::add_client(int sock) { - MutexLock lock(&mutex); clients.insert(make_pair(sock, Client(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; if (client.state() == Client::READING_REQUEST) { - ev.events = EPOLLIN | EPOLLRDHUP; + ev.events = EPOLLIN | EPOLLET | EPOLLRDHUP; } else { // If we don't have more data for this client, we'll be putting it into // the sleeping array again soon. - ev.events = EPOLLOUT | EPOLLRDHUP; + ev.events = EPOLLOUT | EPOLLET | EPOLLRDHUP; } ev.data.u64 = 0; // Keep Valgrind happy. ev.data.fd = client.sock(); @@ -228,6 +269,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) { + client_ptr->stream->put_client_to_sleep(client_ptr); + } else { + process_client(client_ptr); + } } void Server::add_stream(const string &stream_id) @@ -259,14 +307,15 @@ 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) + +void Server::add_data_deferred(const string &stream_id, const char *data, size_t bytes) { - if (bytes == 0) { - return; - } + MutexLock lock(&queued_data_mutex); + queued_data[stream_id].append(string(data, data + bytes)); +} - MutexLock lock(&mutex); +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; @@ -280,76 +329,90 @@ void Server::add_data(const string &stream_id, const char *data, size_t bytes) } memcpy(stream->data + pos, data, bytes); - wake_up_all_clients(); + stream->wake_up_all_clients(); } - + +// See the .h file for postconditions after this function. void Server::process_client(Client *client) { switch (client->state) { case Client::READING_REQUEST: { +read_request_again: // Try to read more of the request. char buf[1024]; int ret; do { ret = read(client->sock, buf, sizeof(buf)); } while (ret == -1 && errno == EINTR); + + if (ret == -1 && errno == EAGAIN) { + // No more data right now. Nothing to do. + // This is postcondition #2. + return; + } if (ret == -1) { perror("read"); close_client(client); return; } if (ret == 0) { - // No data? This really means that we were triggered for something else than - // POLLIN (which suggests a logic error in epoll). - fprintf(stderr, "WARNING: fd %d returned unexpectedly 0 bytes!\n", client->sock); + // OK, the socket is closed. close_client(client); 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( - 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. - return; - } - - if (ptr != client->request.data() + client->request.size() - 4) { + // See if there's more data for us. + goto read_request_again; + 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); } else { construct_error(client, error_code); } - break; + + // We've changed states, so fall through. + assert(client->state == Client::SENDING_ERROR || + client->state == Client::SENDING_HEADER); } case Client::SENDING_ERROR: case Client::SENDING_HEADER: { +sending_header_or_error_again: int ret; do { ret = write(client->sock, client->header_or_error.data() + client->header_or_error_bytes_sent, client->header_or_error.size() - client->header_or_error_bytes_sent); } while (ret == -1 && errno == EINTR); + + if (ret == -1 && errno == EAGAIN) { + // We're out of socket space, so now we're at the “low edge” of epoll's + // edge triggering. epoll will tell us when there is more room, so for now, + // just return. + // This is postcondition #4. + return; + } + if (ret == -1) { + // Error! Postcondition #1. perror("write"); close_client(client); return; @@ -359,33 +422,41 @@ void Server::process_client(Client *client) assert(client->header_or_error_bytes_sent <= client->header_or_error.size()); if (client->header_or_error_bytes_sent < client->header_or_error.size()) { - // We haven't sent all yet. Fine; we'll do that later. - return; + // We haven't sent all yet. Fine; go another round. + goto sending_header_or_error_again; } // We're done sending the header or error! Clear it to release some memory. client->header_or_error.clear(); if (client->state == Client::SENDING_ERROR) { + // We're done sending the error, so now close. + // This is postcondition #1. close_client(client); - } else { - // 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 = find_stream(client->stream_id)->data_size; + return; } - break; + + // 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. + // This is postcondition #3. + client->state = Client::SENDING_DATA; + client->bytes_sent = client->stream->data_size; + client->stream->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; + 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; } @@ -395,10 +466,10 @@ void Server::process_client(Client *client) size_t bytes_first_part = BACKLOG_SIZE - (client->bytes_sent % BACKLOG_SIZE); iovec iov[2]; - iov[0].iov_base = const_cast(stream.data + (client->bytes_sent % BACKLOG_SIZE)); + iov[0].iov_base = const_cast(stream->data + (client->bytes_sent % BACKLOG_SIZE)); iov[0].iov_len = bytes_first_part; - iov[1].iov_base = const_cast(stream.data); + iov[1].iov_base = const_cast(stream->data); iov[1].iov_len = bytes_to_send - bytes_first_part; do { @@ -407,20 +478,31 @@ void Server::process_client(Client *client) } 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); } + if (ret == -1 && errno == EAGAIN) { + // We're out of socket space, so return; epoll will wake us up + // when there is more room. + // This is postcondition #4. + return; + } if (ret == -1) { + // Error, close; postcondition #1. perror("write/writev"); close_client(client); return; } 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. - put_client_to_sleep(client); + // 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? } break; } @@ -448,6 +530,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! @@ -455,14 +538,13 @@ 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; epoll_event ev; - ev.events = EPOLLOUT | EPOLLRDHUP; + ev.events = EPOLLOUT | EPOLLET | EPOLLRDHUP; ev.data.u64 = 0; // Keep Valgrind happy. ev.data.fd = client->sock; @@ -483,7 +565,7 @@ void Server::construct_error(Client *client, int error_code) client->state = Client::SENDING_ERROR; epoll_event ev; - ev.events = EPOLLOUT | EPOLLRDHUP; + ev.events = EPOLLOUT | EPOLLET | EPOLLRDHUP; ev.data.u64 = 0; // Keep Valgrind happy. ev.data.fd = client->sock; @@ -492,6 +574,13 @@ void Server::construct_error(Client *client, int error_code) exit(1); } } + +template +void delete_from(vector *v, T elem) +{ + typename vector::iterator new_end = remove(v->begin(), v->end(), elem); + v->erase(new_end, v->end()); +} void Server::close_client(Client *client) { @@ -501,9 +590,10 @@ void Server::close_client(Client *client) } // This client could be sleeping, so we'll need to fix that. (Argh, O(n).) - vector::iterator new_end = - remove(sleeping_clients.begin(), sleeping_clients.end(), client->sock); - sleeping_clients.erase(new_end, sleeping_clients.end()); + if (client->stream != NULL) { + delete_from(&client->stream->sleeping_clients, client); + delete_from(&client->stream->to_process, client); + } // Bye-bye! int ret; @@ -518,39 +608,26 @@ void Server::close_client(Client *client) clients.erase(client->sock); } -void Server::put_client_to_sleep(Client *client) +Stream *Server::find_stream(const string &stream_id) { - epoll_event ev; - ev.events = EPOLLRDHUP; - ev.data.u64 = 0; // Keep Valgrind happy. - 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); + map::iterator it = streams.find(stream_id); + assert(it != streams.end()); + return it->second; } -void Server::wake_up_all_clients() +void Server::process_queued_data() { - for (unsigned i = 0; i < sleeping_clients.size(); ++i) { - epoll_event ev; - ev.events = EPOLLOUT | EPOLLRDHUP; - ev.data.u64 = 0; // Keep Valgrind happy. - 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); - } + MutexLock lock(&queued_data_mutex); + + for (size_t i = 0; i < queued_add_clients.size(); ++i) { + add_client(queued_add_clients[i]); } - sleeping_clients.clear(); -} + queued_add_clients.clear(); -Stream *Server::find_stream(const string &stream_id) -{ - map::iterator it = streams.find(stream_id); - assert(it != streams.end()); - return it->second; + for (map::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()); + } + queued_data.clear(); }