#include "metacube.h"
#include "server.h"
#include "mutexlock.h"
+#include "parse.h"
#include "state.pb.h"
using namespace std;
Client::Client(int sock)
: sock(sock),
state(Client::READING_REQUEST),
- header_bytes_sent(0),
+ 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()),
- header(serialized.header()),
- header_bytes_sent(serialized.header_bytes_sent()),
+ 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())
{
}
serialized.set_state(state);
serialized.set_request(request);
serialized.set_stream_id(stream_id);
- serialized.set_header(header);
- serialized.set_header_bytes_sent(serialized.header_bytes_sent());
+ 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;
}
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);
Server::~Server()
{
- close(epoll_fd);
+ int ret;
+ do {
+ ret = close(epoll_fd);
+ } while (ret == -1 && errno == EINTR);
+
+ if (ret == -1) {
+ perror("close(epoll_fd)");
+ }
}
void Server::run()
{
for ( ;; ) {
int nfds = epoll_wait(epoll_fd, events, EPOLL_MAX_EVENTS, EPOLL_TIMEOUT_MS);
+ if (nfds == -1 && errno == EINTR) {
+ continue;
+ }
if (nfds == -1) {
perror("epoll_wait");
exit(1);
if (should_stop) {
return;
}
-
+
for (int i = 0; i < nfds; ++i) {
int fd = events[i].data.fd;
assert(clients.count(fd) != 0);
process_client(client);
}
+
+ 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]);
+ }
+ stream->to_process.clear();
+ }
}
}
// 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();
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)
}
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 = read(client->sock, buf, sizeof(buf));
+ 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;
}
"\r\n\r\n", 4));
if (ptr == NULL) {
// OK, we don't have the entire header yet. Fine; we'll get it later.
- return;
+ // See if there's more data for us.
+ goto read_request_again;
}
if (ptr != client->request.data() + client->request.size() - 4) {
return;
}
- parse_request(client);
- construct_header(client);
- break;
+ int error_code = parse_request(client);
+ if (error_code == 200) {
+ construct_header(client);
+ } else {
+ construct_error(client, error_code);
+ }
+
+ // 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: {
- int ret = write(client->sock,
- client->header.data() + client->header_bytes_sent,
- client->header.size() - client->header_bytes_sent);
+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;
}
- client->header_bytes_sent += ret;
- assert(client->header_bytes_sent <= client->header.size());
+ client->header_or_error_bytes_sent += ret;
+ assert(client->header_or_error_bytes_sent <= client->header_or_error.size());
- if (client->header_bytes_sent < client->header.size()) {
- // We haven't sent all yet. Fine; we'll do that later.
- return;
+ if (client->header_or_error_bytes_sent < client->header_or_error.size()) {
+ // We haven't sent all yet. Fine; go another round.
+ goto sending_header_or_error_again;
}
- // We're done sending the header! Clear the entire header to release some memory.
- client->header.clear();
+ // 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);
+ return;
+ }
// 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 = find_stream(client->stream_id)->data_size;
- break;
+ 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;
}
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_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_base = const_cast<char *>(stream->data);
iov[1].iov_len = bytes_to_send - bytes_first_part;
- ret = writev(client->sock, iov, 2);
+ do {
+ ret = writev(client->sock, iov, 2);
+ } while (ret == -1 && errno == EINTR);
} else {
- ret = write(client->sock,
- stream.data + (client->bytes_sent % BACKLOG_SIZE),
- bytes_to_send);
+ 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.
+ // 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;
}
}
}
-void Server::parse_request(Client *client)
+int Server::parse_request(Client *client)
{
- // TODO: Actually parse the request. :-)
- client->stream_id = "stream";
+ vector<string> lines = split_lines(client->request);
+ if (lines.empty()) {
+ return 400; // Bad request (empty).
+ }
+
+ vector<string> request_tokens = split_tokens(lines[0]);
+ if (request_tokens.size() < 2) {
+ return 400; // Bad request (empty).
+ }
+ if (request_tokens[0] != "GET") {
+ return 400; // Should maybe be 405 instead?
+ }
+ if (streams.count(request_tokens[1]) == 0) {
+ return 404; // Not found.
+ }
+
+ client->stream_id = request_tokens[1];
+ client->stream = find_stream(client->stream_id);
client->request.clear();
+
+ return 200; // OK!
}
void Server::construct_header(Client *client)
{
- client->header = "HTTP/1.0 200 OK\r\nContent-type: video/x-flv\r\nCache-Control: no-cache\r\n\r\n" +
+ 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;
// 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;
}
}
-void Server::close_client(Client *client)
+void Server::construct_error(Client *client, int error_code)
{
- if (epoll_ctl(epoll_fd, EPOLL_CTL_DEL, client->sock, NULL) == -1) {
- perror("epoll_ctl(EPOLL_CTL_DEL)");
- exit(1);
- }
+ char error[256];
+ snprintf(error, 256, "HTTP/1.0 %d Error\r\nContent-type: text/plain\r\n\r\nSomething went wrong. Sorry.\r\n",
+ error_code);
+ client->header_or_error = error;
+
+ // Switch states.
+ client->state = Client::SENDING_ERROR;
- // 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.events = EPOLLOUT | EPOLLET | EPOLLRDHUP;
ev.data.u64 = 0; // Keep Valgrind happy.
ev.data.fd = client->sock;
perror("epoll_ctl(EPOLL_CTL_MOD)");
exit(1);
}
-
- sleeping_clients.push_back(client->sock);
}
-
-void Server::wake_up_all_clients()
+
+void Server::close_client(Client *client)
{
- 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);
- }
+ if (epoll_ctl(epoll_fd, EPOLL_CTL_DEL, client->sock, NULL) == -1) {
+ perror("epoll_ctl(EPOLL_CTL_DEL)");
+ exit(1);
+ }
+
+ // 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());
}
- sleeping_clients.clear();
+
+ // Bye-bye!
+ int ret;
+ do {
+ ret = close(client->sock);
+ } while (ret == -1 && errno == EINTR);
+
+ if (ret == -1) {
+ perror("close");
+ }
+
+ clients.erase(client->sock);
}
Stream *Server::find_stream(const string &stream_id)
projects / cubemap / blobdiff