X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=httpinput.cpp;h=1bd14dee87c7d022de1bea1d128059f43428aa8c;hp=e113c5717a76ac27ae6f1a52ae30c93a1b29e747;hb=d4bc12548cd825607e257cbe01f3136ed524cb10;hpb=dc109293b2644d5f1ac85a3f02b3584e82dcf690

diff --git a/httpinput.cpp b/httpinput.cpp
index e113c57..1bd14de 100644
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -18,6 +18,7 @@
 #include "httpinput.h"
 #include "log.h"
 #include "metacube.h"
+#include "mutexlock.h"
 #include "parse.h"
 #include "serverpool.h"
 #include "state.pb.h"
@@ -34,6 +35,10 @@ HTTPInput::HTTPInput(const string &url)
 	  has_metacube_header(false),
 	  sock(-1)
 {
+	pthread_mutex_init(&stats_mutex, NULL);
+	stats.url = url;
+	stats.bytes_received = 0;
+	stats.data_bytes_received = 0;
 }
 
 HTTPInput::HTTPInput(const InputProto &serialized)
@@ -58,6 +63,11 @@ HTTPInput::HTTPInput(const InputProto &serialized)
 	    memcmp(http_header.data() + http_header.size() - 4, "\r\n\r\n", 4) == 0) {
 		http_header.resize(http_header.size() - 2);
 	}
+
+	pthread_mutex_init(&stats_mutex, NULL);
+	stats.url = url;
+	stats.bytes_received = serialized.bytes_received();
+	stats.data_bytes_received = serialized.data_bytes_received();
 }
 
 void HTTPInput::close_socket()
@@ -79,6 +89,8 @@ InputProto HTTPInput::serialize() const
 	serialized.set_pending_data(string(pending_data.begin(), pending_data.end()));
 	serialized.set_has_metacube_header(has_metacube_header);
 	serialized.set_sock(sock);
+	serialized.set_bytes_received(stats.bytes_received);
+	serialized.set_data_bytes_received(stats.data_bytes_received);
 	return serialized;
 }
 
@@ -86,17 +98,16 @@ int HTTPInput::lookup_and_connect(const string &host, const string &port)
 {
 	addrinfo *ai;
 	int err = getaddrinfo(host.c_str(), port.c_str(), NULL, &ai);
-	if (err == -1) {
+	if (err != 0) {
 		log(WARNING, "[%s] Lookup of '%s' failed (%s).",
 			url.c_str(), host.c_str(), gai_strerror(err));
-		freeaddrinfo(ai);
 		return -1;
 	}
 
 	addrinfo *base_ai = ai;
 
 	// Connect to everything in turn until we have a socket.
-	while (ai && !should_stop()) {
+	for ( ; ai && !should_stop(); ai = ai->ai_next) {
 		int sock = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP);
 		if (sock == -1) {
 			// Could be e.g. EPROTONOSUPPORT. The show must go on.
@@ -154,7 +165,6 @@ int HTTPInput::lookup_and_connect(const string &host, const string &port)
 		}
 
 		safe_close(sock);
-		ai = ai->ai_next;
 	}
 
 	// Give the last one as error.
@@ -266,6 +276,7 @@ void HTTPInput::do_work()
 			request_bytes_sent = 0;
 			response.clear();
 			pending_data.clear();
+			has_metacube_header = false;
 			for (size_t i = 0; i < stream_indices.size(); ++i) {
 				servers->set_header(stream_indices[i], "", "");
 			}
@@ -353,7 +364,7 @@ void HTTPInput::do_work()
 				char *ptr = static_cast<char *>(
 					memmem(response.data(), response.size(), "\r\n\r\n", 4));
 				assert(ptr != NULL);
-				extra_data = string(ptr, &response[0] + response.size());
+				extra_data = string(ptr + 4, &response[0] + response.size());
 				response.resize(ptr - response.data());
 			}
 
@@ -387,7 +398,7 @@ void HTTPInput::do_work()
 
 			if (ret == 0) {
 				// This really shouldn't happen...
-				log(ERROR, "[%s] Socket unexpectedly closed while reading header",
+				log(ERROR, "[%s] Socket unexpectedly closed while reading data",
 				           url.c_str());
 				state = CLOSING_SOCKET;
 				continue;
@@ -421,6 +432,10 @@ void HTTPInput::do_work()
 void HTTPInput::process_data(char *ptr, size_t bytes)
 {
 	pending_data.insert(pending_data.end(), ptr, ptr + bytes);
+	{
+		MutexLock mutex(&stats_mutex);
+		stats.bytes_received += bytes;
+	}
 
 	for ( ;; ) {
 		// If we don't have enough data (yet) for even the Metacube header, just return.
@@ -459,21 +474,36 @@ void HTTPInput::process_data(char *ptr, size_t bytes)
 		uint32_t size = ntohl(hdr->size);
 		uint32_t flags = ntohl(hdr->flags);
 
+		if (size > 262144) {
+			log(WARNING, "[%s] Metacube block of %d bytes (flags=%x); corrupted header?",
+				url.c_str(), size, flags);
+		}
+
 		// See if we have the entire block. If not, wait for more data.
 		if (pending_data.size() < sizeof(metacube_block_header) + size) {
 			return;
 		}
 
-		// Send this block on to the data.
+		// Send this block on to the servers.
+		{
+			MutexLock lock(&stats_mutex);
+			stats.data_bytes_received += size;
+		}
 		char *inner_data = pending_data.data() + sizeof(metacube_block_header);
 		if (flags & METACUBE_FLAGS_HEADER) {
 			string header(inner_data, inner_data + size);
 			for (size_t i = 0; i < stream_indices.size(); ++i) {
 				servers->set_header(stream_indices[i], http_header, header);
 			}
-		} else { 
+		} else {
+			StreamStartSuitability suitable_for_stream_start;
+			if (flags & METACUBE_FLAGS_NOT_SUITABLE_FOR_STREAM_START) {
+				suitable_for_stream_start = NOT_SUITABLE_FOR_STREAM_START;
+			} else {
+				suitable_for_stream_start = SUITABLE_FOR_STREAM_START;
+			}
 			for (size_t i = 0; i < stream_indices.size(); ++i) {
-				servers->add_data(stream_indices[i], inner_data, size);
+				servers->add_data(stream_indices[i], inner_data, size, suitable_for_stream_start);
 			}
 		}
 
@@ -492,6 +522,12 @@ void HTTPInput::drop_pending_data(size_t num_bytes)
 	}
 	log(WARNING, "[%s] Dropping %lld junk bytes from stream, maybe it is not a Metacube stream?",
 		url.c_str(), (long long)num_bytes);
+	assert(pending_data.size() >= num_bytes);
 	pending_data.erase(pending_data.begin(), pending_data.begin() + num_bytes);
 }
 
+InputStats HTTPInput::get_stats() const
+{
+	MutexLock lock(&stats_mutex);
+	return stats;
+}