X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.cpp;h=6fa4991b209f389da7f940aa73ff9462f472b8cd;hp=f508710fbc24aaa431c3ef40888518fdc8c6bd21;hb=6889a665614e926437484a556124a5ff60363568;hpb=40eab3b7a07862a5547fc178e1edec22522ed7dc

diff --git a/server.cpp b/server.cpp
index f508710..6fa4991 100644
--- a/server.cpp
+++ b/server.cpp
@@ -19,7 +19,6 @@
 
 #include "accesslog.h"
 #include "log.h"
-#include "markpool.h"
 #include "metacube2.h"
 #include "mutexlock.h"
 #include "parse.h"
@@ -199,6 +198,7 @@ void Server::add_client_from_serialized(const ClientProto &client)
 	}
 
 	if (client_ptr->state == Client::WAITING_FOR_KEYFRAME ||
+	    client_ptr->state == Client::PREBUFFERING ||
 	    (client_ptr->state == Client::SENDING_DATA &&
 	     client_ptr->stream_pos == client_ptr->stream->bytes_received)) {
 		client_ptr->stream->put_client_to_sleep(client_ptr);
@@ -216,11 +216,11 @@ int Server::lookup_stream_by_url(const std::string &url) const
 	return url_it->second;
 }
 
-int Server::add_stream(const string &url, size_t backlog_size, Stream::Encoding encoding)
+int Server::add_stream(const string &url, size_t backlog_size, size_t prebuffering_bytes, Stream::Encoding encoding)
 {
 	MutexLock lock(&mutex);
 	url_map.insert(make_pair(url, streams.size()));
-	streams.push_back(new Stream(url, backlog_size, encoding));
+	streams.push_back(new Stream(url, backlog_size, prebuffering_bytes, encoding));
 	return streams.size() - 1;
 }
 
@@ -252,29 +252,8 @@ void Server::set_header(int stream_index, const string &http_header, const strin
 	assert(stream_index >= 0 && stream_index < ssize_t(streams.size()));
 	streams[stream_index]->http_header = http_header;
 	streams[stream_index]->stream_header = stream_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::WAITING_FOR_KEYFRAME ||
-		    (client->state == Client::SENDING_DATA &&
-		     client->stream_pos == 0)) {
-			construct_header(client);
-		}
-	}
 }
 	
-void Server::set_mark_pool(int stream_index, MarkPool *mark_pool)
-{
-	MutexLock lock(&mutex);
-	assert(clients.empty());
-	assert(stream_index >= 0 && stream_index < ssize_t(streams.size()));
-	streams[stream_index]->mark_pool = mark_pool;
-}
-
 void Server::set_pacing_rate(int stream_index, uint32_t pacing_rate)
 {
 	MutexLock lock(&mutex);
@@ -421,6 +400,18 @@ sending_header_or_error_again:
 			return;
 		}
 		client->stream_pos = stream->last_suitable_starting_point;
+		client->state = Client::PREBUFFERING;
+		// Fall through.
+	}
+	case Client::PREBUFFERING: {
+		Stream *stream = client->stream;
+		size_t bytes_to_send = stream->bytes_received - client->stream_pos;
+		assert(bytes_to_send <= stream->backlog_size);
+		if (bytes_to_send < stream->prebuffering_bytes) {
+			// We don't have enough bytes buffered to start this client yet.
+			stream->put_client_to_sleep(client);
+			return;
+		}
 		client->state = Client::SENDING_DATA;
 		// Fall through.
 	}
@@ -482,18 +473,15 @@ sending_data_again:
 void Server::skip_lost_data(Client *client)
 {
 	Stream *stream = client->stream;
+	if (stream == NULL) {
+		return;
+	}
 	size_t bytes_to_send = stream->bytes_received - client->stream_pos;
 	if (bytes_to_send > stream->backlog_size) {
 		size_t bytes_lost = bytes_to_send - stream->backlog_size;
 		client->stream_pos = stream->bytes_received - stream->backlog_size;
 		client->bytes_lost += bytes_lost;
 		++client->num_loss_events;
-
-		double loss_fraction = double(client->bytes_lost) / double(client->bytes_lost + client->bytes_sent);
-		log(WARNING, "[%s] Client lost %lld bytes (total loss: %.2f%%), maybe too slow connection",
-			client->remote_addr.c_str(),
-			(long long int)(bytes_lost),
-			100.0 * loss_fraction);
 	}
 }
 
@@ -525,18 +513,13 @@ int Server::parse_request(Client *client)
 		return 404;  // Not found.
 	}
 
-	client->url = request_tokens[1];
-	client->stream = streams[url_map_it->second];
-	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) {
-			log_perror("setsockopt(SO_MARK)");
-		}
+	Stream *stream = streams[url_map_it->second];
+	if (stream->http_header.empty()) {
+		return 503;  // Service unavailable.
 	}
+
+	client->url = request_tokens[1];
+	client->stream = stream;
 	if (setsockopt(client->sock, SOL_SOCKET, SO_MAX_PACING_RATE, &client->stream->pacing_rate, sizeof(client->stream->pacing_rate)) == -1) {
 		if (client->stream->pacing_rate != ~0U) {
 			log_perror("setsockopt(SO_MAX_PACING_RATE)");
@@ -623,10 +606,6 @@ void Server::close_client(Client *client)
 	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);
-		}
 	}
 
 	// Log to access_log.