X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=httpinput.h;h=e7c447af52eb310da0d18b5a83cbc7272dfd5933;hp=fc39b30f7c14f5ca701fce33d48e89dcd7a7ccc4;hb=37bc14f5b28f66ccc1760f410091f98769616476;hpb=9abb89bcf7940e2ada9d708f86a218a56334f68d

diff --git a/httpinput.h b/httpinput.h
index fc39b30..e7c447a 100644
--- a/httpinput.h
+++ b/httpinput.h
@@ -1,6 +1,7 @@
 #ifndef _HTTPINPUT_H
 #define _HTTPINPUT_H 1
 
+#include <pthread.h>
 #include <stddef.h>
 #include <string>
 #include <vector>
@@ -11,7 +12,7 @@ class InputProto;
 
 class HTTPInput : public Input {
 public:
-	HTTPInput(const std::string &url);
+	HTTPInput(const std::string &url, Input::Encoding encoding);
 
 	// Serialization/deserialization.
 	HTTPInput(const InputProto &serialized);
@@ -21,10 +22,9 @@ public:
 
 	virtual std::string get_url() const { return url; }
 
-	virtual void add_destination(int stream_index)
-	{
-		stream_indices.push_back(stream_index);
-	}
+	virtual void add_destination(int stream_index);
+
+	virtual InputStats get_stats() const;
 
 private:
 	// Actually does the download.
@@ -59,6 +59,9 @@ private:
 	std::string url;
 	std::string host, port, path;
 
+	// What the input stream is to be interpreted as (normally Metacube).
+	Input::Encoding encoding;
+
 	// The HTTP request, with headers and all.
 	// Only relevant for SENDING_REQUEST.
 	std::string request;
@@ -70,9 +73,12 @@ private:
 	// The HTTP response we've received so far. Only relevant for RECEIVING_HEADER.
 	std::string response;
 
-	// The HTTP respones headers we want to give clients for this input.
+	// The HTTP response headers we want to give clients for this input.
 	std::string http_header;
 
+	// The stream heder we want to give clients for this input.
+	std::string stream_header;
+
 	// Data we have received but not fully processed yet.
 	std::vector<char> pending_data;
 
@@ -81,7 +87,24 @@ private:
 	bool has_metacube_header;
 
 	// The socket we are downloading on (or -1).
-	int sock;	
+	int sock;
+
+	// Mutex protecting <stats>.
+	mutable pthread_mutex_t stats_mutex;
+
+	// The current statistics for this connection. Protected by <stats_mutex>.
+	InputStats stats;
+
+	// Number of (started) connection attempts since last data byte was successfully read.
+	unsigned num_connection_attempts;
+
+	// If set, don't log anything related to connections.
+	// (Only set if we've had enough unsuccessful connection attempts.)
+	bool suppress_logging;
+
+	// Last time we made a connection with logging enabled.
+	// (Initially at some point before the epoch.)
+	timespec last_verbose_connection;
 };
 
 #endif  // !defined(_HTTPINPUT_H)