#include "metacube.h"
#include "server.h"
#include "mutexlock.h"
+#include "state.pb.h"
using namespace std;
+Client::Client(int sock)
+ : sock(sock),
+ state(Client::READING_REQUEST),
+ header_bytes_sent(0),
+ bytes_sent(0)
+{
+ request.reserve(1024);
+}
+
+Client::Client(const ClientProto &serialized)
+ : 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()),
+ bytes_sent(serialized.bytes_sent())
+{
+}
+
+ClientProto Client::serialize() const
+{
+ ClientProto serialized;
+ serialized.set_sock(sock);
+ 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_bytes_sent(bytes_sent);
+ return serialized;
+}
+
+Stream::Stream(const string &stream_id)
+ : stream_id(stream_id),
+ data(new char[BACKLOG_SIZE]),
+ data_size(0)
+{
+ memset(data, 0, BACKLOG_SIZE);
+}
+
+Stream::~Stream()
+{
+ delete[] data;
+}
+
+Stream::Stream(const StreamProto &serialized)
+ : header(serialized.header()),
+ data(new char[BACKLOG_SIZE]),
+ data_size(serialized.data_size())
+{
+ assert(serialized.data().size() == BACKLOG_SIZE);
+ memcpy(data, serialized.data().data(), BACKLOG_SIZE);
+}
+
+StreamProto Stream::serialize() const
+{
+ StreamProto serialized;
+ serialized.set_header(header);
+ serialized.set_data(string(data, data + BACKLOG_SIZE));
+ serialized.set_data_size(data_size);
+ return serialized;
+}
+
Server::Server()
{
pthread_mutex_init(&mutex, NULL);
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);
}
}
}
-
+
+CubemapStateProto Server::serialize() const
+{
+ CubemapStateProto serialized;
+ for (map<int, Client>::const_iterator client_it = clients.begin();
+ client_it != clients.end();
+ ++client_it) {
+ serialized.add_clients()->MergeFrom(client_it->second.serialize());
+ }
+ for (map<string, Stream *>::const_iterator stream_it = streams.begin();
+ stream_it != streams.end();
+ ++stream_it) {
+ serialized.add_streams()->MergeFrom(stream_it->second->serialize());
+ }
+ return serialized;
+}
+
void Server::add_client(int sock)
{
MutexLock lock(&mutex);
- Client new_client;
- new_client.sock = sock;
- new_client.request.reserve(1024);
- new_client.state = Client::READING_REQUEST;
- new_client.header_bytes_sent = 0;
- new_client.bytes_sent = 0;
-
- clients.insert(make_pair(sock, new_client));
+ clients.insert(make_pair(sock, Client(sock)));
// Start listening on data from this socket.
epoll_event ev;
ev.events = EPOLLIN | 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)");
void Server::add_stream(const string &stream_id)
{
MutexLock lock(&mutex);
- streams.insert(make_pair(stream_id, Stream()));
+ streams.insert(make_pair(stream_id, new Stream(stream_id)));
}
void Server::set_header(const string &stream_id, const string &header)
{
MutexLock lock(&mutex);
- assert(streams.count(stream_id) != 0);
- streams[stream_id].header = header;
+ find_stream(stream_id)->header = 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.
+ for (map<int, Client>::iterator client_it = clients.begin();
+ client_it != clients.end();
+ ++client_it) {
+ Client *client = &client_it->second;
+ if (client->state == Client::SENDING_DATA &&
+ client->bytes_sent == 0) {
+ construct_header(client);
+ }
+ }
}
void Server::add_data(const string &stream_id, const char *data, size_t bytes)
}
MutexLock lock(&mutex);
- assert(streams.count(stream_id) != 0);
- Stream *stream = &streams[stream_id];
+ Stream *stream = find_stream(stream_id);
size_t pos = stream->data_size % BACKLOG_SIZE;
stream->data_size += bytes;
}
parse_request(client);
+ construct_header(client);
break;
}
case Client::SENDING_HEADER: {
// 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;
+ client->bytes_sent = find_stream(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];
+ const Stream &stream = *find_stream(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;
+ client->bytes_sent = find_stream(client->stream_id)->data_size - BACKLOG_SIZE;
bytes_to_send = BACKLOG_SIZE;
}
// 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" +
- streams[client->stream_id].header;
+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" +
+ find_stream(client->stream_id)->header;
// Switch states.
client->state = Client::SENDING_HEADER;
epoll_event ev;
ev.events = EPOLLOUT | 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) {
{
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) {
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)");
}
sleeping_clients.clear();
}
+
+Stream *Server::find_stream(const string &stream_id)
+{
+ map<string, Stream *>::iterator it = streams.find(stream_id);
+ assert(it != streams.end());
+ return it->second;
+}
projects / cubemap / blobdiff