X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=shared%2Fhttpd.cpp;h=f447f54876f33b5bbeb453d4cf994cbf9b39c853;hb=948d715655a84b93d8292e64731ea3c32b45deb7;hp=782d18b7e2f7b2924bbf4e23365494dcfe423be0;hpb=0c95058b25adce6f634279bc7feb04158242e63e;p=nageru

diff --git a/shared/httpd.cpp b/shared/httpd.cpp
index 782d18b..f447f54 100644
--- a/shared/httpd.cpp
+++ b/shared/httpd.cpp
@@ -61,7 +61,7 @@ void HTTPD::stop()
 
 void HTTPD::add_data(StreamType stream_type, const char *buf, size_t size, bool keyframe, int64_t time, AVRational timebase)
 {
-	unique_lock<mutex> lock(streams_mutex);
+	lock_guard<mutex> lock(streams_mutex);
 	for (Stream *stream : streams) {
 		if (stream->get_stream_type() == stream_type) {
 			stream->add_data(buf, size, keyframe ? Stream::DATA_TYPE_KEYFRAME : Stream::DATA_TYPE_OTHER, time, timebase);
@@ -133,7 +133,7 @@ int HTTPD::answer_to_connection(MHD_Connection *connection,
 	HTTPD::Stream *stream = new HTTPD::Stream(this, framing, stream_type);
 	stream->add_data(header[stream_type].data(), header[stream_type].size(), Stream::DATA_TYPE_HEADER, AV_NOPTS_VALUE, AVRational{ 1, 0 });
 	{
-		unique_lock<mutex> lock(streams_mutex);
+		lock_guard<mutex> lock(streams_mutex);
 		streams.insert(stream);
 	}
 	++metric_num_connected_clients;
@@ -164,7 +164,7 @@ void HTTPD::free_stream(void *cls)
 		--httpd->metric_num_connected_multicam_clients;
 	}
 	{
-		unique_lock<mutex> lock(httpd->streams_mutex);
+		lock_guard<mutex> lock(httpd->streams_mutex);
 		delete stream;
 		httpd->streams.erase(stream);
 	}
@@ -182,7 +182,7 @@ ssize_t HTTPD::Stream::reader_callback(uint64_t pos, char *buf, size_t max)
 	unique_lock<mutex> lock(buffer_mutex);
 	has_buffered_data.wait(lock, [this] { return should_quit || !buffered_data.empty(); });
 	if (should_quit) {
-		return 0;
+		return -1;
 	}
 
 	ssize_t ret = 0;
@@ -196,6 +196,7 @@ ssize_t HTTPD::Stream::reader_callback(uint64_t pos, char *buf, size_t max)
 			buf += len;
 			ret += len;
 			max -= len;
+			buffered_data_bytes -= s.size();
 			buffered_data.pop_front();
 			used_of_buffered_data = 0;
 		} else {
@@ -213,7 +214,7 @@ ssize_t HTTPD::Stream::reader_callback(uint64_t pos, char *buf, size_t max)
 
 void HTTPD::Stream::add_data(const char *buf, size_t buf_size, HTTPD::Stream::DataType data_type, int64_t time, AVRational timebase)
 {
-	if (buf_size == 0) {
+	if (buf_size == 0 || should_quit) {
 		return;
 	}
 	if (data_type == DATA_TYPE_KEYFRAME) {
@@ -223,7 +224,18 @@ void HTTPD::Stream::add_data(const char *buf, size_t buf_size, HTTPD::Stream::Da
 		return;
 	}
 
-	unique_lock<mutex> lock(buffer_mutex);
+	lock_guard<mutex> lock(buffer_mutex);
+
+	if (buffered_data_bytes + buf_size > (1ULL << 30)) {
+		// More than 1GB of backlog; the client obviously isn't keeping up,
+		// so kill it instead of going out of memory. Note that this
+		// won't kill the client immediately, but will cause the next callback
+		// to kill the client.
+		should_quit = true;
+		buffered_data.clear();
+		has_buffered_data.notify_all();
+		return;
+	}
 
 	if (framing == FRAMING_METACUBE) {
 		int flags = 0;
@@ -249,6 +261,7 @@ void HTTPD::Stream::add_data(const char *buf, size_t buf_size, HTTPD::Stream::Da
 			hdr.csum = htons(metacube2_compute_crc(&hdr));
 			buffered_data.emplace_back((char *)&hdr, sizeof(hdr));
 			buffered_data.emplace_back((char *)&packet, sizeof(packet));
+			buffered_data_bytes += sizeof(hdr) + sizeof(packet);
 		}
 
 		metacube2_block_header hdr;
@@ -257,8 +270,10 @@ void HTTPD::Stream::add_data(const char *buf, size_t buf_size, HTTPD::Stream::Da
 		hdr.flags = htons(flags);
 		hdr.csum = htons(metacube2_compute_crc(&hdr));
 		buffered_data.emplace_back((char *)&hdr, sizeof(hdr));
+		buffered_data_bytes += sizeof(hdr);
 	}
 	buffered_data.emplace_back(buf, buf_size);
+	buffered_data_bytes += buf_size;
 
 	// Send a Metacube2 timestamp every keyframe.
 	if (framing == FRAMING_METACUBE && data_type == DATA_TYPE_KEYFRAME) {
@@ -277,6 +292,7 @@ void HTTPD::Stream::add_data(const char *buf, size_t buf_size, HTTPD::Stream::Da
 		hdr.csum = htons(metacube2_compute_crc(&hdr));
 		buffered_data.emplace_back((char *)&hdr, sizeof(hdr));
 		buffered_data.emplace_back((char *)&packet, sizeof(packet));
+		buffered_data_bytes += sizeof(hdr) + sizeof(packet);
 	}
 
 	has_buffered_data.notify_all();
@@ -284,7 +300,7 @@ void HTTPD::Stream::add_data(const char *buf, size_t buf_size, HTTPD::Stream::Da
 
 void HTTPD::Stream::stop()
 {
-	unique_lock<mutex> lock(buffer_mutex);
+	lock_guard<mutex> lock(buffer_mutex);
 	should_quit = true;
 	has_buffered_data.notify_all();
 }