X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.cpp;h=a2f28e62a1d5ca370194fcd58b4f72bc97473e30;hp=a5f6a329ec2fed4017f7407eeeee0ba932979be7;hb=e3ccdfe0de9b83928b6fdf4f3f1b02cd9585b573;hpb=9b8129d05b5d1ec0caed09a40f170e967afc60b3

diff --git a/server.cpp b/server.cpp
index a5f6a32..a2f28e6 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"
@@ -28,6 +27,10 @@
 #include "stream.h"
 #include "util.h"
 
+#ifndef SO_MAX_PACING_RATE
+#define SO_MAX_PACING_RATE 47
+#endif
+
 using namespace std;
 
 extern AccessLogThread *access_log;
@@ -248,27 +251,14 @@ 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)
+void Server::set_pacing_rate(int stream_index, uint32_t pacing_rate)
 {
 	MutexLock lock(&mutex);
 	assert(clients.empty());
 	assert(stream_index >= 0 && stream_index < ssize_t(streams.size()));
-	streams[stream_index]->mark_pool = mark_pool;
+	streams[stream_index]->pacing_rate = pacing_rate;
 }
 
 void Server::add_data_deferred(int stream_index, const char *data, size_t bytes, StreamStartSuitability suitable_for_stream_start)
@@ -432,7 +422,7 @@ sending_data_again:
 
 		ssize_t ret;
 		do {
-			loff_t offset = client->stream_pos % stream->backlog_size;
+			off_t offset = client->stream_pos % stream->backlog_size;
 			ret = sendfile(client->sock, stream->data_fd, &offset, bytes_to_send);
 		} while (ret == -1 && errno == EINTR);
 
@@ -470,18 +460,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);
 	}
 }
 
@@ -513,16 +500,16 @@ 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.
+	Stream *stream = streams[url_map_it->second];
+	if (stream->http_header.empty()) {
+		return 503;  // Service unavailable.
 	}
-	if (setsockopt(client->sock, SOL_SOCKET, SO_MARK, &client->fwmark, sizeof(client->fwmark)) == -1) {                          
-		if (client->fwmark != 0) {
-			log_perror("setsockopt(SO_MARK)");
+
+	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)");
 		}
 	}
 	client->request.clear();
@@ -606,10 +593,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.