X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=httpd.cpp;h=811e095dc9541a442742e02c7d7454b0284cc207;hb=9e47a2f661b9d292598ef0277e507458e3dad62f;hp=6f94409f3a55fea4244dd441d1fd466f8250d92f;hpb=b1b7b5477664b3871f25e4e990fa8835952303d6;p=nageru

diff --git a/httpd.cpp b/httpd.cpp
index 6f94409..811e095 100644
--- a/httpd.cpp
+++ b/httpd.cpp
@@ -1,19 +1,19 @@
-#include <arpa/inet.h>
+#include "httpd.h"
+
 #include <assert.h>
+#include <byteswap.h>
 #include <endian.h>
 #include <microhttpd.h>
+#include <netinet/in.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-
-#include <vector>
-
-#include "httpd.h"
+#include <sys/time.h>
+#include <time.h>
+#include <memory>
 
 #include "defs.h"
-#include "flags.h"
 #include "metacube2.h"
-#include "timebase.h"
+#include "metrics.h"
 
 struct MHD_Connection;
 struct MHD_Response;
@@ -22,15 +22,18 @@ using namespace std;
 
 HTTPD::HTTPD()
 {
+	global_metrics.add("num_connected_clients", &metric_num_connected_clients, Metrics::TYPE_GAUGE);
 }
 
 HTTPD::~HTTPD()
 {
-	MHD_quiesce_daemon(mhd);
-	for (Stream *stream : streams) {
-		stream->stop();
+	if (mhd) {
+		MHD_quiesce_daemon(mhd);
+		for (Stream *stream : streams) {
+			stream->stop();
+		}
+		MHD_stop_daemon(mhd);
 	}
-	MHD_stop_daemon(mhd);
 }
 
 void HTTPD::start(int port)
@@ -41,6 +44,9 @@ void HTTPD::start(int port)
 	                       &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");
+	}
 }
 
 void HTTPD::add_data(const char *buf, size_t size, bool keyframe)
@@ -73,22 +79,42 @@ int HTTPD::answer_to_connection(MHD_Connection *connection,
 		framing = HTTPD::Stream::FRAMING_RAW;
 	}
 
+	if (strcmp(url, "/metrics") == 0) {
+		string contents = global_metrics.serialize();
+		MHD_Response *response = MHD_create_response_from_buffer(
+			contents.size(), &contents[0], MHD_RESPMEM_MUST_COPY);
+		MHD_add_response_header(response, "Content-type", "text/plain");
+		int ret = MHD_queue_response(connection, MHD_HTTP_OK, response);
+		MHD_destroy_response(response);  // Only decreases the refcount; actual free is after the request is done.
+		return ret;
+	}
+	if (endpoints.count(url)) {
+		pair<string, string> contents_and_type = endpoints[url]();
+		MHD_Response *response = MHD_create_response_from_buffer(
+			contents_and_type.first.size(), &contents_and_type.first[0], MHD_RESPMEM_MUST_COPY);
+		MHD_add_response_header(response, "Content-type", contents_and_type.second.c_str());
+		int ret = MHD_queue_response(connection, MHD_HTTP_OK, response);
+		MHD_destroy_response(response);  // Only decreases the refcount; actual free is after the request is done.
+		return ret;
+	}
+
 	HTTPD::Stream *stream = new HTTPD::Stream(this, framing);
 	stream->add_data(header.data(), header.size(), Stream::DATA_TYPE_HEADER);
 	{
 		unique_lock<mutex> lock(streams_mutex);
 		streams.insert(stream);
 	}
+	++metric_num_connected_clients;
 	*con_cls = stream;
 
 	// Does not strictly have to be equal to MUX_BUFFER_SIZE.
 	MHD_Response *response = MHD_create_response_from_callback(
 		(size_t)-1, MUX_BUFFER_SIZE, &HTTPD::Stream::reader_callback_thunk, stream, &HTTPD::free_stream);
-
 	// TODO: Content-type?
 	if (framing == HTTPD::Stream::FRAMING_METACUBE) {
 		MHD_add_response_header(response, "Content-encoding", "metacube");
 	}
+
 	int ret = MHD_queue_response(connection, MHD_HTTP_OK, response);
 	MHD_destroy_response(response);  // Only decreases the refcount; actual free is after the request is done.
 
@@ -104,6 +130,7 @@ void HTTPD::free_stream(void *cls)
 		delete stream;
 		httpd->streams.erase(stream);
 	}
+	--httpd->metric_num_connected_clients;
 }
 
 ssize_t HTTPD::Stream::reader_callback_thunk(void *cls, uint64_t pos, char *buf, size_t max)