void Server::do_work()
{
for ( ;; ) {
- MutexLock lock(&mutex);
- printf("server thread running\n");
- sleep(1);
+ int nfds = epoll_wait(epoll_fd, events, EPOLL_MAX_EVENTS, EPOLL_TIMEOUT_MS);
+
+ MutexLock lock(&mutex); // We release the mutex between iterations.
+ if (nfds == -1) {
+ perror("epoll_wait");
+ exit(1);
+ }
+
+ for (int i = 0; i < nfds; ++i) {
+ int fd = events[i].data.fd;
+ assert(clients.count(fd) != 0);
+ Client *client = &clients[fd];
+
+ if (events[i].events & (EPOLLERR | EPOLLRDHUP | EPOLLHUP)) {
+ close_client(client);
+ continue;
+ }
+
+ process_client(client);
+ }
}
}
{
MutexLock lock(&mutex);
Client new_client;
+ new_client.sock = sock;
+ new_client.client_request.reserve(1024);
new_client.state = Client::READING_REQUEST;
new_client.header_bytes_sent = 0;
new_client.bytes_sent = 0;
// Start listening on data from this socket.
epoll_event ev;
- ev.events = EPOLLIN;
+ ev.events = EPOLLIN | EPOLLRDHUP;
ev.data.fd = sock;
if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, sock, &ev) == -1) {
perror("epoll_ctl(EPOLL_CTL_ADD)");
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
}
+
+void Server::process_client(Client *client)
+{
+ switch (client->state) {
+ case Client::READING_REQUEST: {
+ // Try to read more of the request.
+ char buf[1024];
+ int ret = read(client->sock, buf, sizeof(buf));
+ 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);
+ close_client(client);
+ return;
+ }
+
+ // Guard against overlong requests gobbling up all of our space.
+ if (client->client_request.size() + ret > MAX_CLIENT_REQUEST) {
+ 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->client_request.size();
+ client->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->client_request.data() + start_at, client->client_request.size() - start_at,
+ "\r\n\r\n", 4));
+ if (ptr == NULL) {
+ // OK, we don't have the entire header yet. Fine; we'll get it later.
+ return;
+ }
+
+ if (ptr != client->client_request.data() + client->client_request.size() - 4) {
+ fprintf(stderr, "WARNING: fd %d had junk data after request!\n", client->sock);
+ close_client(client);
+ return;
+ }
+
+ 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());
+
+ if (client->header_bytes_sent < client->header.size()) {
+ // We haven't sent all yet. Fine; we'll do that later.
+ return;
+ }
+
+ // 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;
+ }
+ 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)
+{
+ if (epoll_ctl(epoll_fd, EPOLL_CTL_DEL, client->sock, NULL) == -1) {
+ perror("epoll_ctl(EPOLL_CTL_DEL)");
+ exit(1);
+ }
+
+ // Bye-bye!
+ close(client->sock);
+ clients.erase(client->sock);
+}
projects / cubemap / blobdiff