X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=shared%2Fhttpd.cpp;h=74d0c26d72b1252ae1485490ab2daef41725211c;hb=f7752bad9a473d26ff1fa7c83ac82dca098b63bb;hp=a2668f5987c352d2d3c7c501a86cd86828ffe682;hpb=eeda8995329601f9f4e35047358400833eeae68e;p=nageru

diff --git a/shared/httpd.cpp b/shared/httpd.cpp
index a2668f5..74d0c26 100644
--- a/shared/httpd.cpp
+++ b/shared/httpd.cpp
@@ -26,6 +26,12 @@ using namespace std;
 HTTPD::HTTPD()
 {
 	global_metrics.add("num_connected_clients", &metric_num_connected_clients, Metrics::TYPE_GAUGE);
+	global_metrics.add("num_connected_multicam_clients", &metric_num_connected_multicam_clients, Metrics::TYPE_GAUGE);
+	for (unsigned stream_idx = 0; stream_idx < MAX_VIDEO_CARDS; ++stream_idx) {
+		global_metrics.add("num_connected_siphon_clients",
+			{{ "card", to_string(stream_idx) }},
+			&metric_num_connected_siphon_clients[stream_idx], Metrics::TYPE_GAUGE);
+	}
 }
 
 HTTPD::~HTTPD()
@@ -39,7 +45,6 @@ void HTTPD::start(int port)
 	                       port,
 	                       nullptr, nullptr,
 	                       &answer_to_connection_thunk, this,
-	                       MHD_OPTION_NOTIFY_COMPLETED, nullptr, this,
 	                       MHD_OPTION_END);
 	if (mhd == nullptr) {
 		fprintf(stderr, "Warning: Could not open HTTP server. (Port already in use?)\n");
@@ -58,12 +63,24 @@ void HTTPD::stop()
 	}
 }
 
-void HTTPD::add_data(StreamType stream_type, const char *buf, size_t size, bool keyframe, int64_t time, AVRational timebase)
+void HTTPD::set_header(StreamID stream_id, const string &data)
+{
+	lock_guard<mutex> lock(streams_mutex);
+	header[stream_id] = data;
+	add_data_locked(stream_id, data.data(), data.size(), Stream::DATA_TYPE_HEADER, AV_NOPTS_VALUE, AVRational{ 1, 0 });
+}
+
+void HTTPD::add_data(StreamID stream_id, const char *buf, size_t size, bool keyframe, int64_t time, AVRational timebase)
+{
+	lock_guard<mutex> lock(streams_mutex);
+	add_data_locked(stream_id, buf, size, keyframe ? Stream::DATA_TYPE_KEYFRAME : Stream::DATA_TYPE_OTHER, time, timebase);
+}
+
+void HTTPD::add_data_locked(StreamID stream_id, const char *buf, size_t size, Stream::DataType data_type, int64_t time, AVRational timebase)
 {
-	unique_lock<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);
+		if (stream->get_stream_id() == stream_id) {
+			stream->add_data(buf, size, data_type, time, timebase);
 		}
 	}
 }
@@ -89,11 +106,16 @@ int HTTPD::answer_to_connection(MHD_Connection *connection,
 	} else {
 		framing = HTTPD::Stream::FRAMING_RAW;
 	}
-	HTTPD::StreamType stream_type;
+	HTTPD::StreamID stream_id;
 	if (strcmp(url, "/multicam.mp4") == 0) {
-		stream_type = HTTPD::StreamType::MULTICAM_STREAM;
+		stream_id.type = HTTPD::StreamType::MULTICAM_STREAM;
+		stream_id.index = 0;
+	} else if (strncmp(url, "/feeds/", 7) == 0) {
+		stream_id.type = HTTPD::StreamType::SIPHON_STREAM;
+		stream_id.index = atoi(url + 7);
 	} else {
-		stream_type = HTTPD::StreamType::MAIN_STREAM;
+		stream_id.type = HTTPD::StreamType::MAIN_STREAM;
+		stream_id.index = 0;
 	}
 
 	if (strcmp(url, "/metrics") == 0) {
@@ -129,13 +151,20 @@ int HTTPD::answer_to_connection(MHD_Connection *connection,
 		return ret;
 	}
 
-	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 });
+	HTTPD::Stream *stream = new HTTPD::Stream(this, framing, stream_id);
+	const string &hdr = header[stream_id];
+	stream->add_data(hdr.data(), hdr.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;
+	if (stream_id.type == HTTPD::StreamType::MULTICAM_STREAM) {
+		++metric_num_connected_multicam_clients;
+	}
+	if (stream_id.type == HTTPD::StreamType::SIPHON_STREAM) {
+		++metric_num_connected_siphon_clients[stream_id.index];
+	}
 	*con_cls = stream;
 
 	// Does not strictly have to be equal to MUX_BUFFER_SIZE.
@@ -156,8 +185,14 @@ void HTTPD::free_stream(void *cls)
 {
 	HTTPD::Stream *stream = (HTTPD::Stream *)cls;
 	HTTPD *httpd = stream->get_parent();
+	if (stream->get_stream_id().type == HTTPD::StreamType::MULTICAM_STREAM) {
+		--httpd->metric_num_connected_multicam_clients;
+	}
+	if (stream->get_stream_id().type == HTTPD::StreamType::SIPHON_STREAM) {
+		--httpd->metric_num_connected_siphon_clients[stream->get_stream_id().index];
+	}
 	{
-		unique_lock<mutex> lock(httpd->streams_mutex);
+		lock_guard<mutex> lock(httpd->streams_mutex);
 		delete stream;
 		httpd->streams.erase(stream);
 	}
@@ -173,9 +208,22 @@ ssize_t HTTPD::Stream::reader_callback_thunk(void *cls, uint64_t pos, char *buf,
 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(); });
+	bool has_data = has_buffered_data.wait_for(lock, std::chrono::seconds(60), [this] { return should_quit || !buffered_data.empty(); });
 	if (should_quit) {
-		return 0;
+		return -1;
+	}
+	if (!has_data) {
+		// The wait timed out, so tell microhttpd to clean out the socket;
+		// it's not unlikely that the client has given up anyway.
+		// This is seemingly the only way to actually reap sockets if we
+		// do not get any data; returning 0 does nothing, and
+		// MHD_OPTION_NOTIFY_CONNECTION does not trigger for these cases.
+		// If not, an instance that has no data to send (typically an instance
+		// of kaeru connected to a nonfunctional backend) would get a steadily
+		// increasing amount of sockets in CLOSE_WAIT (ie., the other end has
+		// hung up, but we haven't called close() yet, as our thread is stuck
+		// in this callback).
+		return -1;
 	}
 
 	ssize_t ret = 0;
@@ -189,6 +237,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 {
@@ -206,7 +255,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) {
@@ -216,7 +265,19 @@ 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.
+		fprintf(stderr, "HTTP client had more than 1 GB backlog; killing.\n");
+		should_quit = true;
+		buffered_data.clear();
+		has_buffered_data.notify_all();
+		return;
+	}
 
 	if (framing == FRAMING_METACUBE) {
 		int flags = 0;
@@ -242,6 +303,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;
@@ -250,8 +312,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) {
@@ -270,6 +334,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();
@@ -277,7 +342,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();
 }