X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=httpd.cpp;h=c6a233deae66f6dca2eecc5476ec275a5928ca98;hb=refs%2Ftags%2F1.3.1;hp=1e4005453fc5aad0fe02600106f22f85ac7005d3;hpb=24bffd6b8467cd91764514e8f666fe68849dfc45;p=nageru

diff --git a/httpd.cpp b/httpd.cpp
index 1e40054..c6a233d 100644
--- a/httpd.cpp
+++ b/httpd.cpp
@@ -23,14 +23,23 @@ HTTPD::HTTPD()
 {
 }
 
+HTTPD::~HTTPD()
+{
+	MHD_quiesce_daemon(mhd);
+	for (Stream *stream : streams) {
+		stream->stop();
+	}
+	MHD_stop_daemon(mhd);
+}
+
 void HTTPD::start(int port)
 {
-	MHD_start_daemon(MHD_USE_THREAD_PER_CONNECTION | MHD_USE_POLL_INTERNALLY | MHD_USE_DUAL_STACK,
-	                 port,
-			 nullptr, nullptr,
-			 &answer_to_connection_thunk, this,
-	                 MHD_OPTION_NOTIFY_COMPLETED, &request_completed_thunk, this, 
-	                 MHD_OPTION_END);
+	mhd = MHD_start_daemon(MHD_USE_THREAD_PER_CONNECTION | MHD_USE_POLL_INTERNALLY | MHD_USE_DUAL_STACK,
+	                       port,
+	                       nullptr, nullptr,
+	                       &answer_to_connection_thunk, this,
+	                       MHD_OPTION_NOTIFY_COMPLETED, nullptr, this,
+	                       MHD_OPTION_END);
 }
 
 void HTTPD::add_data(const char *buf, size_t size, bool keyframe)
@@ -63,7 +72,7 @@ int HTTPD::answer_to_connection(MHD_Connection *connection,
 		framing = HTTPD::Stream::FRAMING_RAW;
 	}
 
-	HTTPD::Stream *stream = new HTTPD::Stream(framing);
+	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);
@@ -80,36 +89,19 @@ int HTTPD::answer_to_connection(MHD_Connection *connection,
 		MHD_add_response_header(response, "Content-encoding", "metacube");
 	}
 	int ret = MHD_queue_response(connection, MHD_HTTP_OK, response);
-	//MHD_destroy_response(response);
+	MHD_destroy_response(response);  // Only decreases the refcount; actual free is after the request is done.
 
 	return ret;
 }
 
 void HTTPD::free_stream(void *cls)
 {
-	// FIXME: When is this actually called, if ever?
-	// Also, shouldn't we remove it from streams?
 	HTTPD::Stream *stream = (HTTPD::Stream *)cls;
-	delete stream;
-}
-
-void HTTPD::request_completed_thunk(void *cls, struct MHD_Connection *connection, void **con_cls, enum MHD_RequestTerminationCode toe)
-{
-	HTTPD *httpd = (HTTPD *)cls;
-	return httpd->request_completed(connection, con_cls, toe);
-}
-
-void HTTPD::request_completed(struct MHD_Connection *connection, void **con_cls, enum MHD_RequestTerminationCode toe)
-{
-	if (con_cls == nullptr) {
-		// Request was never set up.
-		return;
-	}
-	HTTPD::Stream *stream = (HTTPD::Stream *)*con_cls;
+	HTTPD *httpd = stream->get_parent();
 	{
-		unique_lock<mutex> lock(streams_mutex);
+		unique_lock<mutex> lock(httpd->streams_mutex);
 		delete stream;
-		streams.erase(stream);
+		httpd->streams.erase(stream);
 	}
 }
 
@@ -122,7 +114,10 @@ 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 !buffered_data.empty(); });
+	has_buffered_data.wait(lock, [this]{ return should_quit || !buffered_data.empty(); });
+	if (should_quit) {
+		return 0;
+	}
 
 	ssize_t ret = 0;
 	while (max > 0 && !buffered_data.empty()) {
@@ -182,3 +177,9 @@ void HTTPD::Stream::add_data(const char *buf, size_t buf_size, HTTPD::Stream::Da
 	has_buffered_data.notify_all();	
 }
 
+void HTTPD::Stream::stop()
+{
+	unique_lock<mutex> lock(buffer_mutex);
+	should_quit = true;
+	has_buffered_data.notify_all();
+}