#include <vector>
#include <string>
#include <map>
+#include <algorithm>
#include "metacube.h"
#include "server.h"
void Server::run()
{
- pthread_t thread;
- pthread_create(&thread, NULL, Server::do_work_thunk, this);
+ 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;
+ }
+
+ if (pthread_join(worker_thread, NULL) == -1) {
+ perror("pthread_join");
+ exit(1);
+ }
}
void *Server::do_work_thunk(void *arg)
{
for ( ;; ) {
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);
}
-
+
+ MutexLock lock(&mutex); // We release the mutex between iterations.
+
+ if (should_stop) {
+ return;
+ }
+
for (int i = 0; i < nfds; ++i) {
int fd = events[i].data.fd;
assert(clients.count(fd) != 0);
MutexLock lock(&mutex);
Client new_client;
new_client.sock = sock;
- new_client.client_request.reserve(1024);
+ new_client.request.reserve(1024);
new_client.state = Client::READING_REQUEST;
new_client.header_bytes_sent = 0;
new_client.bytes_sent = 0;
void Server::add_data(const string &stream_id, const char *data, size_t bytes)
{
- // TODO
+ if (bytes == 0) {
+ return;
+ }
+
+ MutexLock lock(&mutex);
+ assert(streams.count(stream_id) != 0);
+ Stream *stream = &streams[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);
+ wake_up_all_clients();
}
void Server::process_client(Client *client)
}
// Guard against overlong requests gobbling up all of our space.
- if (client->client_request.size() + ret > MAX_CLIENT_REQUEST) {
+ if (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 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->client_request.data() + start_at, client->client_request.size() - start_at,
+ memmem(client->request.data() + start_at, 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) {
+ if (ptr != client->request.data() + client->request.size() - 4) {
fprintf(stderr, "WARNING: fd %d had junk data after request!\n", client->sock);
close_client(client);
return;
// but we'll start sending immediately as we get data.
client->state = Client::SENDING_DATA;
client->bytes_sent = streams[client->stream_id].data_size;
+ break;
+ }
+ 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 = streams[client->stream_id];
+ size_t bytes_to_send = stream.data_size - client->bytes_sent;
+ 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 = streams[client->stream_id].data_size - BACKLOG_SIZE;
+ bytes_to_send = 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;
+
+ 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);
+ } else {
+ ret = write(client->sock,
+ stream.data + (client->bytes_sent % BACKLOG_SIZE),
+ bytes_to_send);
+ }
+ if (ret == -1) {
+ perror("write/writev");
+ close_client(client);
+ return;
+ }
+ client->bytes_sent += ret;
+
+ 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);
+ }
+ break;
}
default:
- // TODO
assert(false);
}
}
{
// TODO: Actually parse the request. :-)
client->stream_id = "stream";
+ client->request.clear();
// Construct the header.
- client->header = "HTTP/1.0 200 OK\r\nContent-type: todo/fixme\r\n\r\n" +
+ client->header = "HTTP/1.0 200 OK\r\n Content-type: video/x-flv\r\nCache-Control: no-cache\r\nContent-type: todo/fixme\r\n\r\n" +
streams[client->stream_id].header;
// Switch states.
perror("epoll_ctl(EPOLL_CTL_DEL)");
exit(1);
}
+
+ // 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.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);
+}
+
+void Server::wake_up_all_clients()
+{
+ for (unsigned i = 0; i < sleeping_clients.size(); ++i) {
+ epoll_event ev;
+ ev.events = EPOLLOUT | EPOLLRDHUP;
+ 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);
+ }
+ }
+ sleeping_clients.clear();
+}
projects / cubemap / blobdiff