X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.cpp;h=a11b55f72e6f62d7e1401925e4c113a58df9ceec;hp=855e21c9767587fba2590fccadb47cdb5de852c5;hb=ca5f208423d42bc6d9a8601d5f9a6ffae0119f40;hpb=a0ad2d9d955fcb5f0aa3cf4f89999c34e8408124

diff --git a/server.cpp b/server.cpp
index 855e21c..a11b55f 100644
--- a/server.cpp
+++ b/server.cpp
@@ -1,99 +1,32 @@
-#include <stdio.h>
-#include <string.h>
-#include <stdint.h>
 #include <assert.h>
-#include <arpa/inet.h>
-#include <curl/curl.h>
-#include <sys/socket.h>
+#include <errno.h>
 #include <pthread.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <sys/epoll.h>
-#include <errno.h>
-#include <vector>
-#include <string>
-#include <map>
+#include <sys/sendfile.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <unistd.h>
 #include <algorithm>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
-#include "metacube.h"
-#include "server.h"
+#include "markpool.h"
 #include "mutexlock.h"
 #include "parse.h"
+#include "server.h"
 #include "state.pb.h"
+#include "stream.h"
 
 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, 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())
-{
-}
-
-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_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;
-}
-
-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)
-	: stream_id(serialized.stream_id()),
-	  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);
-	serialized.set_stream_id(stream_id);
-	return serialized;
-}
-
 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) {
@@ -114,35 +47,17 @@ Server::~Server()
 	}
 }
 
-void Server::run()
-{
-	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()
+vector<ClientStats> Server::get_client_stats() const
 {
-	{
-		MutexLock lock(&mutex);
-		should_stop = true;
-	}
+	vector<ClientStats> ret;
 
-	if (pthread_join(worker_thread, NULL) == -1) {
-		perror("pthread_join");
-		exit(1);
+	MutexLock lock(&mutex);
+	for (map<int, Client>::const_iterator client_it = clients.begin();
+	     client_it != clients.end();
+	     ++client_it) {
+		ret.push_back(client_it->second.get_stats());
 	}
-}
-
-void *Server::do_work_thunk(void *arg)
-{
-	Server *server = static_cast<Server *>(arg);
-	server->do_work();
-	return NULL;
+	return ret;
 }
 
 void Server::do_work()
@@ -150,6 +65,9 @@ void Server::do_work()
 	for ( ;; ) {
 		int nfds = epoll_wait(epoll_fd, events, EPOLL_MAX_EVENTS, EPOLL_TIMEOUT_MS);
 		if (nfds == -1 && errno == EINTR) {
+			if (should_stop) {
+				return;
+			}
 			continue;
 		}
 		if (nfds == -1) {
@@ -159,10 +77,8 @@ void Server::do_work()
 
 		MutexLock lock(&mutex);  // We release the mutex between iterations.
 	
-		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);
@@ -175,11 +91,28 @@ void Server::do_work()
 
 			process_client(client);
 		}
+
+		for (map<string, Stream *>::iterator stream_it = streams.begin();
+		     stream_it != streams.end();
+		     ++stream_it) {
+			vector<Client *> 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]);
+			}
+		}
+
+		if (should_stop) {
+			return;
+		}
 	}
 }
 
-CubemapStateProto Server::serialize() const
+CubemapStateProto Server::serialize()
 {
+	// We don't serialize anything queued, so empty the queues.
+	process_queued_data();
+
 	CubemapStateProto serialized;
 	for (map<int, Client>::const_iterator client_it = clients.begin();
 	     client_it != clients.end();
@@ -194,27 +127,41 @@ 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);
-	Stream *stream = find_stream(client.stream_id());
+	Stream *stream;
+	map<string, Stream *>::iterator stream_it = streams.find(client.stream_id());
+	if (stream_it == streams.end()) {
+		stream = NULL;
+	} else {
+		stream = stream_it->second;
+	}
 	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;
@@ -231,12 +178,19 @@ 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->stream_pos == client_ptr->stream->bytes_received) {
+		client_ptr->stream->put_client_to_sleep(client_ptr);
+	} else {
+		process_client(client_ptr);
+	}
 }
 
-void Server::add_stream(const string &stream_id)
+void Server::add_stream(const string &stream_id, size_t backlog_size)
 {
 	MutexLock lock(&mutex);
-	streams.insert(make_pair(stream_id, new Stream(stream_id)));
+	streams.insert(make_pair(stream_id, new Stream(stream_id, backlog_size)));
 }
 
 void Server::add_stream_from_serialized(const StreamProto &stream)
@@ -245,6 +199,13 @@ void Server::add_stream_from_serialized(const StreamProto &stream)
 	streams.insert(make_pair(stream.stream_id(), new Stream(stream)));
 }
 	
+void Server::set_backlog_size(const std::string &stream_id, size_t new_size)
+{
+	MutexLock lock(&mutex);
+	assert(streams.count(stream_id) != 0);
+	streams[stream_id]->set_backlog_size(new_size);
+}
+	
 void Server::set_header(const string &stream_id, const string &header)
 {
 	MutexLock lock(&mutex);
@@ -257,33 +218,23 @@ void Server::set_header(const string &stream_id, const string &header)
 	     ++client_it) {
 		Client *client = &client_it->second;
 		if (client->state == Client::SENDING_DATA &&
-		    client->bytes_sent == 0) {
+		    client->stream_pos == 0) {
 			construct_header(client);
 		}
 	}
 }
 	
-void Server::add_data(const string &stream_id, const char *data, size_t bytes)
+void Server::set_mark_pool(const std::string &stream_id, MarkPool *mark_pool)
 {
-	if (bytes == 0) {
-		return;
-	}
-
 	MutexLock lock(&mutex);
-	Stream *stream = find_stream(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;
-	}
+	assert(clients.empty());
+	find_stream(stream_id)->mark_pool = mark_pool;
+}
 
-	memcpy(stream->data + pos, data, bytes);
-	wake_up_all_clients();
+void Server::add_data_deferred(const string &stream_id, const char *data, size_t bytes)
+{
+	MutexLock lock(&queued_data_mutex);
+	queued_data[stream_id].append(string(data, data + bytes));
 }
 
 // See the .h file for postconditions after this function.	
@@ -315,34 +266,27 @@ read_request_again:
 			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<char *>(
-			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.
 			// See if there's more data for us.
 			goto read_request_again;
-		}
-
-		if (ptr != client->request.data() + client->request.size() - 4) {
+		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);
@@ -401,45 +345,42 @@ sending_header_or_error_again:
 		// 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;
-		sleeping_clients.push_back(client);
+		client->stream_pos = client->stream->bytes_received;
+		client->stream->put_client_to_sleep(client);
 		return;
 	}
 	case Client::SENDING_DATA: {
+sending_data_again:
 		// 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 = client->stream;
-		size_t bytes_to_send = stream->data_size - client->bytes_sent;
-		if (bytes_to_send > BACKLOG_SIZE) {
+		Stream *stream = client->stream;
+		size_t bytes_to_send = stream->bytes_received - client->stream_pos;
+		if (bytes_to_send == 0) {
+			return;
+		}
+		if (bytes_to_send > stream->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 = stream->data_size - BACKLOG_SIZE;
-			bytes_to_send = BACKLOG_SIZE;
+			        (long long int)(bytes_to_send - stream->backlog_size));
+			client->stream_pos = stream->bytes_received - stream->backlog_size;
+			client->bytes_lost += bytes_to_send - stream->backlog_size;
+			++client->num_loss_events;
+			bytes_to_send = stream->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;
+		bool more_data = false;
+		if ((client->stream_pos % stream->backlog_size) + bytes_to_send > stream->backlog_size) {
+			bytes_to_send = stream->backlog_size - (client->stream_pos % stream->backlog_size);
+			more_data = true;
+		}
 
-			iov[1].iov_base = const_cast<char *>(stream->data);
-			iov[1].iov_len = bytes_to_send - bytes_first_part;
+		ssize_t ret;
+		do {
+			loff_t offset = client->stream_pos % stream->backlog_size;
+			ret = sendfile(client->sock, stream->data_fd, &offset, bytes_to_send);
+		} while (ret == -1 && errno == EINTR);
 
-			do {
-				ret = writev(client->sock, iov, 2);
-			} while (ret == -1 && errno == EINTR);
-		} else {
-			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.
@@ -448,19 +389,19 @@ sending_header_or_error_again:
 		}
 		if (ret == -1) {
 			// Error, close; postcondition #1.
-			perror("write/writev");
+			perror("sendfile");
 			close_client(client);
 			return;
 		}
+		client->stream_pos += ret;
 		client->bytes_sent += ret;
 
-		if (client->bytes_sent == stream->data_size) {
+		if (client->stream_pos == stream->bytes_received) {
 			// We don't have any more data for this client, so put it to sleep.
 			// This is postcondition #3.
-			put_client_to_sleep(client);
-		} else {
-			// XXX: Do we need to go another round here to explicitly
-			// get the EAGAIN?
+			stream->put_client_to_sleep(client);
+		} else if (more_data && ret == bytes_to_send) {
+			goto sending_data_again;
 		}
 		break;
 	}
@@ -488,7 +429,17 @@ int Server::parse_request(Client *client)
 	}
 
 	client->stream_id = request_tokens[1];
-	client->stream = streams[client->stream_id];
+	client->stream = find_stream(client->stream_id);
+	if (client->stream->mark_pool != NULL) {
+		client->fwmark = client->stream->mark_pool->get_mark();
+	} else {
+		client->fwmark = 0;  // No mark.
+	}
+	if (setsockopt(client->sock, SOL_SOCKET, SO_MARK, &client->fwmark, sizeof(client->fwmark)) == -1) {                          
+		if (client->fwmark != 0) {
+			perror("setsockopt(SO_MARK)");
+		}
+	}
 	client->request.clear();
 
 	return 200;  // OK!
@@ -496,8 +447,7 @@ 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;
@@ -533,6 +483,13 @@ void Server::construct_error(Client *client, int error_code)
 		exit(1);
 	}
 }
+
+template<class T>
+void delete_from(vector<T> *v, T elem)
+{
+	typename vector<T>::iterator new_end = remove(v->begin(), v->end(), elem);
+	v->erase(new_end, v->end());
+}
 	
 void Server::close_client(Client *client)
 {
@@ -542,10 +499,15 @@ void Server::close_client(Client *client)
 	}
 
 	// This client could be sleeping, so we'll need to fix that. (Argh, O(n).)
-	vector<Client *>::iterator new_end =
-		remove(sleeping_clients.begin(), sleeping_clients.end(), client);
-	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);
+		if (client->stream->mark_pool != NULL) {
+			int fwmark = client->fwmark;
+			client->stream->mark_pool->release_mark(fwmark);
+		}
+	}
+
 	// Bye-bye!
 	int ret;
 	do {
@@ -559,23 +521,28 @@ 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)
 {
-	sleeping_clients.push_back(client);
+	map<string, Stream *>::iterator it = streams.find(stream_id);
+	assert(it != streams.end());
+	return it->second;
 }
 
-void Server::wake_up_all_clients()
+void Server::process_queued_data()
 {
-	vector<Client *> to_process;
-	swap(sleeping_clients, to_process);
-	for (unsigned i = 0; i < to_process.size(); ++i) {
-		process_client(to_process[i]);
+	MutexLock lock(&queued_data_mutex);
+
+	for (size_t i = 0; i < queued_add_clients.size(); ++i) {
+		add_client(queued_add_clients[i]);
 	}
-}
+	queued_add_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;
+	for (map<string, string>::iterator queued_it = queued_data.begin();
+	     queued_it != queued_data.end();
+	     ++queued_it) {
+		Stream *stream = find_stream(queued_it->first);
+		stream->add_data(queued_it->second.data(), queued_it->second.size());
+		stream->wake_up_all_clients();
+	}
+	queued_data.clear();
 }